diff --git a/flink-cyber/caracal-generator/pom.xml b/flink-cyber/caracal-generator/pom.xml
index a40060e5d..f825b12e9 100644
--- a/flink-cyber/caracal-generator/pom.xml
+++ b/flink-cyber/caracal-generator/pom.xml
@@ -33,6 +33,13 @@
             <artifactId>flink-connector-kafka</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-clients</artifactId>
+            <scope>provided</scope>
+            <version>${flink.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.hortonworks.smm</groupId>
             <artifactId>monitoring-interceptors</artifactId>
diff --git a/flink-cyber/caracal-parser/pom.xml b/flink-cyber/caracal-parser/pom.xml
index f8b9e6f7c..45f034690 100644
--- a/flink-cyber/caracal-parser/pom.xml
+++ b/flink-cyber/caracal-parser/pom.xml
@@ -126,8 +126,12 @@
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
-            <version>${flink.version}</version>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
         </dependency>
 
         <dependency>
@@ -164,6 +168,11 @@
             <artifactId>flink-orc</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.orc</groupId>
+            <artifactId>orc-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.parquet</groupId>
             <artifactId>parquet-avro</artifactId>
diff --git a/flink-cyber/flink-alert-scoring-api/src/main/java/com/cloudera/cyber/scoring/ScoredMessage.java b/flink-cyber/flink-alert-scoring-api/src/main/java/com/cloudera/cyber/scoring/ScoredMessage.java
index f38eaab00..144aafabd 100644
--- a/flink-cyber/flink-alert-scoring-api/src/main/java/com/cloudera/cyber/scoring/ScoredMessage.java
+++ b/flink-cyber/flink-alert-scoring-api/src/main/java/com/cloudera/cyber/scoring/ScoredMessage.java
@@ -54,7 +54,7 @@ public long getTs() {
         return message.getTs();
     }
 
-    public static final Schema SCHEMA$ = AvroSchemas.createRecordBuilder(ScoredMessage.class.getPackage().getName(), ScoredMessage.class.getName())
+    public static final Schema SCHEMA$ = AvroSchemas.createRecordBuilder(ScoredMessage.class.getPackage().getName(), ScoredMessage.class.getName(), null)
             .fields()
             .name("message").type(Message.SCHEMA$).noDefault()
             .name("cyberScoresDetails").type(Schema.createArray(Scores.SCHEMA$)).noDefault()
diff --git a/flink-cyber/flink-alert-scoring/pom.xml b/flink-cyber/flink-alert-scoring/pom.xml
index 91a09d67c..1b6a740e0 100644
--- a/flink-cyber/flink-alert-scoring/pom.xml
+++ b/flink-cyber/flink-alert-scoring/pom.xml
@@ -95,6 +95,11 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-statebackend-rocksdb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
     <build>
diff --git a/flink-cyber/flink-commands/json-commands/pom.xml b/flink-cyber/flink-commands/json-commands/pom.xml
index 520d7b2a9..73a303e65 100644
--- a/flink-cyber/flink-commands/json-commands/pom.xml
+++ b/flink-cyber/flink-commands/json-commands/pom.xml
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -70,15 +69,14 @@
             <version>${log4j.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/flink-cyber/flink-commands/scoring-commands/pom.xml b/flink-cyber/flink-commands/scoring-commands/pom.xml
index 5c2d9a8cb..8db7fc7d7 100644
--- a/flink-cyber/flink-commands/scoring-commands/pom.xml
+++ b/flink-cyber/flink-commands/scoring-commands/pom.xml
@@ -60,6 +60,14 @@
             <version>${jackson.datatype.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <!-- Logging and Metrics -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -90,6 +98,10 @@
             <artifactId>avro</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-java</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -128,6 +140,12 @@
                                     </excludes>
                                 </filter>
                             </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.google.</pattern>
+                                    <shadedPattern>com.cloudera.cyber.com.google.</shadedPattern>
+                                </relocation>
+                            </relocations>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>com.cloudera.cyber.scoring.ScoringJobKafka</mainClass>
diff --git a/flink-cyber/flink-common/pom.xml b/flink-cyber/flink-common/pom.xml
index 52401b821..53f49a4a7 100644
--- a/flink-cyber/flink-common/pom.xml
+++ b/flink-cyber/flink-common/pom.xml
@@ -43,9 +43,22 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-kafka</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-base</artifactId>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>
diff --git a/flink-cyber/flink-cyber-api/pom.xml b/flink-cyber/flink-cyber-api/pom.xml
index f2548139e..2d72699bc 100644
--- a/flink-cyber/flink-cyber-api/pom.xml
+++ b/flink-cyber/flink-cyber-api/pom.xml
@@ -32,6 +32,19 @@
         </plugins>
     </build>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <!-- Import dependency management from Spring Boot -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+     </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -55,10 +68,15 @@
             <artifactId>flink-table-common</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>${avro.version}</version>
         </dependency>
 
         <dependency>
diff --git a/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/Message.java b/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/Message.java
index 44e5dc8c1..ea7e61e16 100644
--- a/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/Message.java
+++ b/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/Message.java
@@ -18,6 +18,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
+import org.apache.avro.LogicalTypes;
 import org.apache.avro.Schema;
 import org.apache.avro.SchemaBuilder;
 import org.apache.avro.specific.SpecificRecord;
@@ -56,7 +57,7 @@ public class Message extends SpecificRecordBase implements SpecificRecord, Ident
     public static final Schema SCHEMA$ = AvroSchemas.createRecordBuilder(Message.class.getPackage().getName(), Message.class.getName())
             .fields()
             .requiredString("id")
-            .requiredLong("ts")
+            .name("ts").type(LogicalTypes.timestampMillis().addToSchema(Schema.create(Schema.Type.LONG))).noDefault()
             .name("originalSource").type(SignedSourceKey.SCHEMA$).noDefault()
             .requiredString("message")
             .name("threats").type().optional().type(SchemaBuilder.map().values(SchemaBuilder.array().items(ThreatIntelligence.SCHEMA$)))
diff --git a/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/avro/AvroSchemas.java b/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/avro/AvroSchemas.java
index 9bec6f190..8309f15ac 100644
--- a/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/avro/AvroSchemas.java
+++ b/flink-cyber/flink-cyber-api/src/main/java/com/cloudera/cyber/avro/AvroSchemas.java
@@ -5,8 +5,16 @@
 public class AvroSchemas {
 
     public static SchemaBuilder.RecordBuilder<org.apache.avro.Schema> createRecordBuilder(String namespace, String recordName) {
-        return SchemaBuilder.record(recordName).namespace(namespace)
-                .prop("ssb.rowtimeAttribute", "ts")
-                .prop("ssb.watermarkExpression", "`ts` - INTERVAL '30' SECOND");
+        return createRecordBuilder(namespace, recordName, "ts");
+    }
+
+    public static SchemaBuilder.RecordBuilder<org.apache.avro.Schema> createRecordBuilder(String namespace, String recordName, String tsFieldName) {
+        SchemaBuilder.RecordBuilder<org.apache.avro.Schema> recordBuilder = SchemaBuilder.record(recordName).namespace(namespace);
+        if (tsFieldName != null) {
+            recordBuilder
+                    .prop("ssb.rowtimeAttribute", tsFieldName)
+                    .prop("ssb.watermarkExpression", String.format("`%s` - INTERVAL '30' SECOND", tsFieldName));
+        }
+        return recordBuilder;
     }
 }
diff --git a/flink-cyber/flink-dedupe/pom.xml b/flink-cyber/flink-dedupe/pom.xml
index 4309f769e..17afd33b6 100644
--- a/flink-cyber/flink-dedupe/pom.xml
+++ b/flink-cyber/flink-dedupe/pom.xml
@@ -45,7 +45,12 @@
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
         </dependency>
 
         <dependency>
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-cidr/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-cidr/pom.xml
index d21ad7006..deda184cf 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-cidr/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-cidr/pom.xml
@@ -90,6 +90,11 @@
             <classifier>tests</classifier>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.hortonworks.smm</groupId>
             <artifactId>monitoring-interceptors</artifactId>
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-geocode/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-geocode/pom.xml
index 2fb92f1e9..26c2abf46 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-geocode/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-geocode/pom.xml
@@ -156,6 +156,11 @@
             <version>${commons-validator.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-load/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-load/pom.xml
index 94d4fe0be..e2cff6357 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-load/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-load/pom.xml
@@ -72,25 +72,19 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-hbase-${flink.hbase.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-client</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.cloudera.cyber</groupId>
             <artifactId>flink-cyber-api</artifactId>
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-lookup-common/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-lookup-common/pom.xml
index 2c989478e..02b05df64 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-lookup-common/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-lookup-common/pom.xml
@@ -39,6 +39,14 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-lookup-hbase/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-lookup-hbase/pom.xml
index 0e6eb89a8..12b1ebb80 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-lookup-hbase/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-lookup-hbase/pom.xml
@@ -52,21 +52,19 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-hbase-${flink.hbase.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.cloudera.cyber</groupId>
             <artifactId>flink-cyber-api</artifactId>
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-lookup-raw/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-lookup-raw/pom.xml
index 17b0965be..af287c78e 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-lookup-raw/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-lookup-raw/pom.xml
@@ -50,10 +50,15 @@
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.cloudera.cyber</groupId>
             <artifactId>flink-cyber-api</artifactId>
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-lookup-rest/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-lookup-rest/pom.xml
index aff14970e..26f45cfaa 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-lookup-rest/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-lookup-rest/pom.xml
@@ -51,10 +51,15 @@
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.cloudera.cyber</groupId>
             <artifactId>flink-cyber-api</artifactId>
@@ -118,10 +123,14 @@
             <version>${global.httpclient.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty</artifactId>
-            <version>5.11.1</version>
+            <artifactId>mockserver-netty-no-dependencies</artifactId>
+            <version>RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -196,8 +205,8 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-                    <!-- use separate jvm to run each test.  mockserver secure and insecure get confused if tests run in the same jvm -->
-                    <forkMode>always</forkMode>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/flink-cyber/flink-enrichment/flink-enrichment-threatq/pom.xml b/flink-cyber/flink-enrichment/flink-enrichment-threatq/pom.xml
index 87db355a9..dadba9cfb 100644
--- a/flink-cyber/flink-enrichment/flink-enrichment-threatq/pom.xml
+++ b/flink-cyber/flink-enrichment/flink-enrichment-threatq/pom.xml
@@ -47,21 +47,19 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-hbase-${flink.hbase.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.cloudera.cyber</groupId>
             <artifactId>flink-cyber-api</artifactId>
diff --git a/flink-cyber/flink-hbase-common/pom.xml b/flink-cyber/flink-hbase-common/pom.xml
index 461776d8d..e8180bd16 100644
--- a/flink-cyber/flink-hbase-common/pom.xml
+++ b/flink-cyber/flink-hbase-common/pom.xml
@@ -31,13 +31,6 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-hbase-${flink.hbase.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
diff --git a/flink-cyber/flink-indexing/flink-indexing-hive/pom.xml b/flink-cyber/flink-indexing/flink-indexing-hive/pom.xml
index e24480a13..734aa9ae4 100644
--- a/flink-cyber/flink-indexing/flink-indexing-hive/pom.xml
+++ b/flink-cyber/flink-indexing/flink-indexing-hive/pom.xml
@@ -56,22 +56,47 @@
             <version>${project.parent.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-clients</artifactId>
+            <version>${flink.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-runtime</artifactId>
+            <version>${flink.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-avro</artifactId>
+        </dependency>
 
         <!-- Flink Dependency -->
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-streaming-java</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.esotericsoftware.kryo</groupId>
+                    <artifactId>kryo</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java-bridge</artifactId>
+            <artifactId>flink-table-api-java</artifactId>
             <scope>provided</scope>
+            <version>${flink.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-planner-loader</artifactId>
             <version>${flink.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -88,13 +113,22 @@
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
 
         <!-- Hive dependencies -->
         <dependency>
@@ -323,15 +357,18 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
+            <version>${jupiter.junit.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -344,6 +381,10 @@
             <version>2.2.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-api-java-bridge</artifactId>
+        </dependency>
 
     </dependencies>
 
@@ -354,7 +395,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>${maven-shade-plugin.version}</version>
                 <executions>
                     <!-- Run shade goal on package phase -->
                     <execution>
@@ -370,6 +411,7 @@
                                     <exclude>org.slf4j:*</exclude>
                                     <exclude>log4j:*</exclude>
                                     <exclude>org.apache.logging.log4j:*</exclude>
+                                    <exclude>org.apache.avro:avro</exclude>
                                 </excludes>
                             </artifactSet>
                             <filters>
@@ -381,6 +423,7 @@
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>org/apache/avro/**</exclude>
                                     </excludes>
                                 </filter>
                             </filters>
@@ -400,6 +443,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/flink-cyber/flink-indexing/flink-indexing-hive/src/main/java/com/cloudera/cyber/indexing/hive/tableapi/impl/MapRowToAvro.java b/flink-cyber/flink-indexing/flink-indexing-hive/src/main/java/com/cloudera/cyber/indexing/hive/tableapi/impl/MapRowToAvro.java
new file mode 100644
index 000000000..935c1c1bd
--- /dev/null
+++ b/flink-cyber/flink-indexing/flink-indexing-hive/src/main/java/com/cloudera/cyber/indexing/hive/tableapi/impl/MapRowToAvro.java
@@ -0,0 +1,40 @@
+package com.cloudera.cyber.indexing.hive.tableapi.impl;
+
+import com.cloudera.cyber.indexing.hive.util.AvroSchemaUtil;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.flink.api.common.functions.MapFunction;
+import org.apache.flink.api.common.typeinfo.TypeInformation;
+import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
+import org.apache.flink.formats.avro.typeutils.GenericRecordAvroTypeInfo;
+import org.apache.flink.types.Row;
+
+import java.util.Set;
+
+public class MapRowToAvro implements ResultTypeQueryable<GenericRecord>, MapFunction<Row, GenericRecord> {
+    private final GenericRecordAvroTypeInfo producedType;
+    private final Schema schema;
+
+    public MapRowToAvro(String schemaString) {
+        this.schema = new Schema.Parser().parse(schemaString);
+        this.producedType = new GenericRecordAvroTypeInfo(schema);
+    }
+
+    @Override
+    public TypeInformation<GenericRecord> getProducedType() {
+        return producedType;
+    }
+
+    @Override
+    public GenericRecord map(Row row) throws Exception {
+        final GenericRecord record = new GenericData.Record(schema);
+        final Set<String> fieldNames = row.getFieldNames(true);
+        if (fieldNames != null) {
+            for (String fieldName : fieldNames) {
+                AvroSchemaUtil.putRowIntoAvro(row, record, fieldName);
+            }
+        }
+        return record;
+    }
+}
diff --git a/flink-cyber/flink-indexing/flink-indexing-hive/src/main/java/com/cloudera/cyber/indexing/hive/tableapi/impl/TableApiKafkaJob.java b/flink-cyber/flink-indexing/flink-indexing-hive/src/main/java/com/cloudera/cyber/indexing/hive/tableapi/impl/TableApiKafkaJob.java
index 6d24c9c04..208545317 100644
--- a/flink-cyber/flink-indexing/flink-indexing-hive/src/main/java/com/cloudera/cyber/indexing/hive/tableapi/impl/TableApiKafkaJob.java
+++ b/flink-cyber/flink-indexing/flink-indexing-hive/src/main/java/com/cloudera/cyber/indexing/hive/tableapi/impl/TableApiKafkaJob.java
@@ -55,18 +55,7 @@ protected void executeInsert(StreamTableEnvironment tableEnv, Map<String, Mappin
         final String schemaString = AvroSchemaUtil.convertToAvro(tablesConfig.get(mappingDto.getTableName()))
             .toString();
 
-        final DataStream<GenericRecord> stream = tableEnv.toDataStream(table).map(row -> {
-          final Schema schema = new Schema.Parser().parse(schemaString);
-          final GenericRecord record = new GenericData.Record(schema);
-          final Set<String> fieldNames = row.getFieldNames(true);
-          if (fieldNames != null) {
-            for (String fieldName : fieldNames) {
-              AvroSchemaUtil.putRowIntoAvro(row, record, fieldName);
-            }
-          }
-
-          return record;
-        });
+        final DataStream<GenericRecord> stream = tableEnv.toDataStream(table).map(new MapRowToAvro(schemaString));
         stream.sinkTo(kafkaSink);
         System.out.printf("Insert SQL added to the queue for the table: %s%nSQL: %s%n", mappingDto.getTableName(),
             insertSql);
diff --git a/flink-cyber/flink-indexing/flink-indexing-hive/src/test/java/com/cloudera/cyber/indexing/hive/TimestampNormalizerTest.java b/flink-cyber/flink-indexing/flink-indexing-hive/src/test/java/com/cloudera/cyber/indexing/hive/TimestampNormalizerTest.java
index ad7a5b294..7ded82282 100644
--- a/flink-cyber/flink-indexing/flink-indexing-hive/src/test/java/com/cloudera/cyber/indexing/hive/TimestampNormalizerTest.java
+++ b/flink-cyber/flink-indexing/flink-indexing-hive/src/test/java/com/cloudera/cyber/indexing/hive/TimestampNormalizerTest.java
@@ -13,13 +13,15 @@
 package com.cloudera.cyber.indexing.hive;
 
 import com.cloudera.cyber.MessageUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.Date;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class TimestampNormalizerTest {
 
     private final SimpleDateFormat hiveDateFormatter = new SimpleDateFormat(HiveStreamingMessageWriter.HIVE_DATE_FORMAT);
@@ -31,24 +33,24 @@ public void testLongTimestamp() {
         long currentMillis = MessageUtils.getCurrentTimestamp();
         String expectedTimestamp = hiveDateFormatter.format(Date.from(Instant.ofEpochMilli(currentMillis)));
         String fieldValue = Long.toString(currentMillis);
-        Assert.assertEquals(expectedTimestamp, normalizer.apply(fieldValue));
+        assertEquals(expectedTimestamp, normalizer.apply(fieldValue));
     }
 
     @Test
     public void testFirstFormattedTimestamp() {
         String fieldValue = "2020-11-19 22:00:01.000000";
-        Assert.assertEquals("2020-11-19 22:00:01.000", normalizer.apply(fieldValue));
+        assertEquals("2020-11-19 22:00:01.000", normalizer.apply(fieldValue));
     }
 
     @Test
     public void testLastFormattedTimestamp() {
         String fieldValue = "2020-01-15T23:05:33Z";
-        Assert.assertEquals("2020-01-15 23:05:33.000", normalizer.apply(fieldValue));
+        assertEquals("2020-01-15 23:05:33.000", normalizer.apply(fieldValue));
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test
     public void testTimestampWithoutMatch() {
         String fieldValue = "not a timestamp";
-        normalizer.apply(fieldValue);
+        assertThrows(IllegalStateException.class, () -> normalizer.apply(fieldValue));
     }
 }
diff --git a/flink-cyber/flink-indexing/flink-indexing-parquet/pom.xml b/flink-cyber/flink-indexing/flink-indexing-parquet/pom.xml
index 11251b1bb..88fe32a62 100644
--- a/flink-cyber/flink-indexing/flink-indexing-parquet/pom.xml
+++ b/flink-cyber/flink-indexing/flink-indexing-parquet/pom.xml
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>${avro.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
@@ -68,6 +67,11 @@
             <artifactId>flink-orc</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.orc</groupId>
+            <artifactId>orc-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.parquet</groupId>
             <artifactId>parquet-avro</artifactId>
@@ -94,7 +98,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>${maven-shade-plugin.version}</version>
                 <executions>
                     <!-- Run shade goal on package phase -->
                     <execution>
diff --git a/flink-cyber/flink-indexing/flink-indexing-solr/pom.xml b/flink-cyber/flink-indexing/flink-indexing-solr/pom.xml
index b054654d3..74857e384 100644
--- a/flink-cyber/flink-indexing/flink-indexing-solr/pom.xml
+++ b/flink-cyber/flink-indexing/flink-indexing-solr/pom.xml
@@ -84,6 +84,11 @@
             <artifactId>flink-connector-kafka</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-test-utils</artifactId>
@@ -99,7 +104,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>${maven-shade-plugin.version}</version>
                 <executions>
                     <!-- Run shade goal on package phase -->
                     <execution>
@@ -129,6 +134,12 @@
                                     </excludes>
                                 </filter>
                             </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.google.</pattern>
+                                    <shadedPattern>com.cloudera.cyber.com.google.</shadedPattern>
+                                </relocation>
+                            </relocations>
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
diff --git a/flink-cyber/flink-indexing/pom.xml b/flink-cyber/flink-indexing/pom.xml
index 8f3c54d15..d9ab934f4 100644
--- a/flink-cyber/flink-indexing/pom.xml
+++ b/flink-cyber/flink-indexing/pom.xml
@@ -27,7 +27,6 @@
     <modules>
         <module>flink-indexing-parquet</module>
         <module>flink-indexing-solr</module>
-        <module>flink-indexing-elastic</module>
         <module>flink-indexing-search</module>
         <module>flink-indexing-hive</module>
        <!-- <module>flink-indexing-hive-partitions</module> -->
diff --git a/flink-cyber/flink-profiler-java/pom.xml b/flink-cyber/flink-profiler-java/pom.xml
index 424da0b37..15f1fae45 100644
--- a/flink-cyber/flink-profiler-java/pom.xml
+++ b/flink-cyber/flink-profiler-java/pom.xml
@@ -36,17 +36,14 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-hbase-${flink.hbase.version}</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>javax.el</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-client</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
         </dependency>
         <dependency>
             <groupId>com.cloudera.cyber</groupId>
diff --git a/flink-cyber/flink-profiler/pom.xml b/flink-cyber/flink-profiler/pom.xml
index e5bc41fed..173f44311 100644
--- a/flink-cyber/flink-profiler/pom.xml
+++ b/flink-cyber/flink-profiler/pom.xml
@@ -59,6 +59,10 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
     </dependencies>
 
 
diff --git a/flink-cyber/flink-sessions/pom.xml b/flink-cyber/flink-sessions/pom.xml
index 36cf88de1..5e2fc78ff 100644
--- a/flink-cyber/flink-sessions/pom.xml
+++ b/flink-cyber/flink-sessions/pom.xml
@@ -35,7 +35,12 @@
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cloudera-registry</artifactId>
+            <artifactId>flink-connector-cloudera-registry</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hortonworks.registries</groupId>
+            <artifactId>schema-registry-serdes</artifactId>
         </dependency>
 
         <dependency>
diff --git a/flink-cyber/flink-stellar/pom.xml b/flink-cyber/flink-stellar/pom.xml
index b153e0a34..4ed271838 100644
--- a/flink-cyber/flink-stellar/pom.xml
+++ b/flink-cyber/flink-stellar/pom.xml
@@ -35,7 +35,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <commons.config.version>1.10</commons.config.version>
         <guava_version>${guava.version}</guava_version>
-        <curator.version>4.3.0.${cdh.version}</curator.version>
+        <curator.version>5.4.0.${cdh.version}</curator.version>
         <global_aesh_version>0.66.19</global_aesh_version>
         <global_jackson_version>2.7.4</global_jackson_version>
         <global_json_simple_version>1.1.1</global_json_simple_version>
diff --git a/flink-cyber/metron-hbase-common/src/test/java/org/apache/metron/hbase/mock/MockHTable.java b/flink-cyber/metron-hbase-common/src/test/java/org/apache/metron/hbase/mock/MockHTable.java
index 05a1f03c8..6e17ae48f 100644
--- a/flink-cyber/metron-hbase-common/src/test/java/org/apache/metron/hbase/mock/MockHTable.java
+++ b/flink-cyber/metron-hbase-common/src/test/java/org/apache/metron/hbase/mock/MockHTable.java
@@ -45,20 +45,7 @@
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Append;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Durability;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Increment;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.client.Row;
-import org.apache.hadoop.hbase.client.RowMutations;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
+import org.apache.hadoop.hbase.client.*;
 import org.apache.hadoop.hbase.client.coprocessor.Batch;
 import org.apache.hadoop.hbase.client.metrics.ScanMetrics;
 import org.apache.hadoop.hbase.filter.CompareFilter;
@@ -159,6 +146,11 @@ public TableDescriptor getDescriptor() throws IOException {
                 .build();
     }
 
+    @Override
+    public RegionLocator getRegionLocator() throws IOException {
+        return null;
+    }
+
     @Override
     public boolean exists(Get get) throws IOException {
         if (get.getFamilyMap() == null || get.getFamilyMap().size() == 0) {
@@ -598,7 +590,7 @@ public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, Compa
     }
 
     @Override
-    public void mutateRow(RowMutations rowMutations) throws IOException {
+    public Result mutateRow(RowMutations rowMutations) throws IOException {
         throw new UnsupportedOperationException();
 
     }
diff --git a/flink-cyber/metron-parser-chain/parser-chains-config-service/pom.xml b/flink-cyber/metron-parser-chain/parser-chains-config-service/pom.xml
index a14a5e157..353513de2 100644
--- a/flink-cyber/metron-parser-chain/parser-chains-config-service/pom.xml
+++ b/flink-cyber/metron-parser-chain/parser-chains-config-service/pom.xml
@@ -168,6 +168,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/flink-cyber/metron-parser-chain/parser-chains-parsers/pom.xml b/flink-cyber/metron-parser-chain/parser-chains-parsers/pom.xml
index 8da4ed140..3d8a39291 100644
--- a/flink-cyber/metron-parser-chain/parser-chains-parsers/pom.xml
+++ b/flink-cyber/metron-parser-chain/parser-chains-parsers/pom.xml
@@ -27,7 +27,6 @@
         <!-- main dependency versions -->
         <antlr4.version>${antlr.version}</antlr4.version>
         <java-grok.version>0.1.9</java-grok.version>
-        <global_shade_version>3.2.0</global_shade_version>
     </properties>
 
     <dependencies>
@@ -194,7 +193,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>${global_shade_version}</version>
+                <version>${maven-shade-plugin.version}</version>
                 <configuration>
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                     <artifactSet>
diff --git a/flink-cyber/metron-parser-chain/pom.xml b/flink-cyber/metron-parser-chain/pom.xml
index 2a8a1fb35..dc9c22406 100644
--- a/flink-cyber/metron-parser-chain/pom.xml
+++ b/flink-cyber/metron-parser-chain/pom.xml
@@ -41,7 +41,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- plugin versions -->
-        <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
@@ -50,7 +49,6 @@
 
         <!-- main dependency versions -->
         <lombok.version>1.18.12</lombok.version>
-        <spring-boot.version>2.7.6</spring-boot.version>
         <evo-inflector.version>1.2.2</evo-inflector.version>
         <slf4j.version>1.7.15</slf4j.version>
 
diff --git a/flink-cyber/parser-chains-flink/pom.xml b/flink-cyber/parser-chains-flink/pom.xml
index 366efe323..650b1be65 100644
--- a/flink-cyber/parser-chains-flink/pom.xml
+++ b/flink-cyber/parser-chains-flink/pom.xml
@@ -33,6 +33,7 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-streaming-java</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-clients</artifactId>
@@ -51,6 +52,28 @@
             <artifactId>hbase-client</artifactId>
             <version>${hbase.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jul-to-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>log4j-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -84,6 +107,13 @@
             <artifactId>flink-parquet</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.cloudera.cyber</groupId>
+            <artifactId>flink-logging</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.parquet</groupId>
             <artifactId>parquet-avro</artifactId>
@@ -98,6 +128,26 @@
                     <groupId>it.unimi.dsi</groupId>
                     <artifactId>fastutil</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jul-to-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>log4j-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-reload4j</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -106,6 +156,24 @@
             <artifactId>parser-chains-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jul-to-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>log4j-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -120,38 +188,6 @@
             <artifactId>multiline-string</artifactId>
         </dependency>
 
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-
-        <dependency>
-            <!-- API bridge between log4j 1 and 2 -->
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -243,7 +279,7 @@
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
+                                     </excludes>
                                 </filter>
                             </filters>
                             <transformers>
diff --git a/flink-cyber/pom.xml b/flink-cyber/pom.xml
index 160c8b54f..a84ce30cd 100644
--- a/flink-cyber/pom.xml
+++ b/flink-cyber/pom.xml
@@ -55,20 +55,22 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <flink.version>1.15.1-csa1.9.0.1</flink.version>
+        <csa.version>csa1.12.0.0</csa.version>
+        <flink.version>1.18.0-csa1.12.0.0</flink.version>
+        <cloudera.registry>1.0-${csa.version}</cloudera.registry>
         <flink.hbase.version>2.4</flink.hbase.version>
-        <cdh.version>7.1.7.0-551</cdh.version>
+        <cdh.version>7.1.9.0-387</cdh.version>
         <lombok.version>1.18.22</lombok.version>
         <lombok.plugin.version>1.18.16.0</lombok.plugin.version>
         <guava.version>21.0</guava.version>
-        <avro.version>1.10.0</avro.version>
-        <log4j.kafka.version>2.5.0.${cdh.version}</log4j.kafka.version>
+        <avro.version>1.11.3</avro.version>
+        <log4j.kafka.version>3.4.1.${cdh.version}</log4j.kafka.version>
         <scala.binary.version>2.12</scala.binary.version>
-        <kafka.version>2.5.0.${cdh.version}</kafka.version>
+        <kafka.version>3.4.1.${cdh.version}</kafka.version>
         <nifi.version>1.11.4</nifi.version>
         <jackson.version>2.11.2</jackson.version>
         <jackson.datatype.version>2.10.1</jackson.datatype.version>
-        <smm.intercepter.version>2.1.0.${cdh.version}</smm.intercepter.version>
+        <smm.intercepter.version>2.3.0.${cdh.version}</smm.intercepter.version>
         <flink.format.parquet.version>1.11.1</flink.format.parquet.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.17.2</log4j.version>
@@ -76,21 +78,21 @@
         <springdoc-openapi.version>1.6.11</springdoc-openapi.version>
         <multiline-string.version>0.1.2</multiline-string.version>
         <testcontainers.version>1.15.0</testcontainers.version>
-        <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
+        <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
         <maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
         <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-        <solr.version>8.4.1.${cdh.version}</solr.version>
+        <solr.version>8.11.2.${cdh.version}</solr.version>
         <maxmind.version>2.13.1</maxmind.version>
         <hadoop.version>3.1.1.${cdh.version}</hadoop.version>
-        <hbase.version>2.2.3.${cdh.version}</hbase.version>
+        <hbase.version>2.4.17.${cdh.version}</hbase.version>
         <mockito.version>3.6.0</mockito.version>
         <datasketches.version>1.3.0-incubating</datasketches.version>
         <assertj.version>3.17.2</assertj.version>
         <json.simple.version>1.1.1</json.simple.version>
         <jupiter.junit.version>5.9.3</jupiter.junit.version>
-        <phoenix.version>5.1.0.${cdh.version}</phoenix.version>
+        <phoenix.version>5.1.1.${cdh.version}</phoenix.version>
         <phoenix.queryserver>6.0.0.${cdh.version}</phoenix.queryserver>
         <classindex.version>3.4</classindex.version>
         <antlr.version>4.9.3</antlr.version>
@@ -112,6 +114,8 @@
         <commons-text.version>1.10.0</commons-text.version>
         <java-grok.version>0.1.9</java-grok.version>
         <everit-json-schema.version>1.14.2</everit-json-schema.version>
+        <orc.version>1.5.1.${cdh.version}</orc.version>
+        <swagger-annotations.version>1.6.0</swagger-annotations.version>
         <graalvm.version>21.3.9</graalvm.version>
         <junit.version>4.12</junit.version>
         <junit5.version>5.7.0</junit5.version>
@@ -161,10 +165,26 @@
 
             <dependency>
                 <groupId>org.apache.flink</groupId>
-                <artifactId>flink-connector-kafka</artifactId>
+                <artifactId>flink-conector-base</artifactId>
                 <version>${flink.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.flink</groupId>
+                <artifactId>flink-connector-kafka</artifactId>
+                <version>3.1-${csa.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.kafka</groupId>
+                        <artifactId>kafka-clients</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.flink</groupId>
                 <artifactId>flink-connector-hive_${scala.binary.version}</artifactId>
@@ -217,6 +237,12 @@
                 <artifactId>flink-orc</artifactId>
                 <version>${flink.version}</version>
                 <scope>provided</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.orc</groupId>
+                        <artifactId>orc-core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -228,10 +254,21 @@
 
             <dependency>
                 <groupId>org.apache.flink</groupId>
-                <artifactId>flink-connector-hbase</artifactId>
-                <version>${flink.version}</version>
+                <artifactId>flink-connector-hbase-${flink.hbase.version}</artifactId>
+                <version>3.0-${csa.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.hbase</groupId>
+                        <artifactId>hbase-client</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.orc</groupId>
+                <artifactId>orc-core</artifactId>
+                <version>${orc.version}</version>
+            </dependency>
 <!--            replacing inside flink-cloudera-registry-->
             <dependency>
                 <groupId>com.github.erosb</groupId>
@@ -241,17 +278,29 @@
 
             <dependency>
                 <groupId>org.apache.flink</groupId>
-                <artifactId>flink-cloudera-registry</artifactId>
-                <version>${flink.version}</version>
+                <artifactId>flink-connector-cloudera-registry</artifactId>
+                <version>1.0-${csa.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.avro</groupId>
                         <artifactId>avro</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.avro</groupId>
+                        <artifactId>avro</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.hortonworks.registries</groupId>
+                        <artifactId>schema-registry-serdes</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>org.everit.json</groupId>
                         <artifactId>org.everit.json.schema</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>log4j-over-slf4j</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -302,12 +351,6 @@
                 <version>${flink.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.flink</groupId>
-                <artifactId>flink-connector-elasticsearch7</artifactId>
-                <version>${flink.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.solr</groupId>
                 <artifactId>solr-solrj</artifactId>
@@ -379,7 +422,14 @@
             <dependency>
                 <groupId>com.hortonworks.registries</groupId>
                 <artifactId>schema-registry-serdes</artifactId>
-                <version>0.9.1</version>
+                <version>0.10.0.${cdh.version}</version>
+                <scope>compile</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>log4j-over-slf4j</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- Utilities -->
@@ -417,6 +467,13 @@
                 <version>${jackson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <scope>compile</scope>
+                <version>${jackson.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>commons-validator</groupId>
                 <artifactId>commons-validator</artifactId>
@@ -660,12 +717,7 @@
                 <dependency>
                     <groupId>org.apache.flink</groupId>
                     <artifactId>flink-connector-kafka</artifactId>
-                    <version>${flink.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.flink</groupId>
-                    <artifactId>flink-cloudera-registry</artifactId>
-                    <version>${flink.version}</version>
+                    <version>3.1-${csa.version}</version>
                 </dependency>
             </dependencies>
         </profile>