diff --git a/assemblies/plugins/databases/hive-assemblies/pom.xml b/assemblies/plugins/databases/hive-assemblies/pom.xml
index 066f328d1dc..e0b584b28f4 100644
--- a/assemblies/plugins/databases/hive-assemblies/pom.xml
+++ b/assemblies/plugins/databases/hive-assemblies/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <!--    Version information : https://github.com/apache/hive/blob/master/pom.xml-->
-        <libthrift.version>0.16.0</libthrift.version>
+        <libthrift.version>0.9.3</libthrift.version>
     </properties>
 
     <dependencies>
@@ -62,6 +62,10 @@
                     <groupId>org.glassfish.web</groupId>
                     <artifactId>javax.servlet.jsp</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -81,6 +85,10 @@
                     <groupId>org.glassfish.web</groupId>
                     <artifactId>javax.servlet.jsp</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -105,6 +113,10 @@
                     <groupId>org.glassfish.web</groupId>
                     <artifactId>javax.servlet.jsp</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -116,6 +128,12 @@
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
@@ -134,6 +152,10 @@
                     <groupId>org.glassfish.web</groupId>
                     <artifactId>javax.servlet.jsp</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -153,6 +175,10 @@
                     <groupId>org.glassfish.web</groupId>
                     <artifactId>javax.servlet.jsp</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/assemblies/plugins/engines/beam/pom.xml b/assemblies/plugins/engines/beam/pom.xml
index cc5f12016cb..fb8059a695e 100644
--- a/assemblies/plugins/engines/beam/pom.xml
+++ b/assemblies/plugins/engines/beam/pom.xml
@@ -462,6 +462,12 @@
             <groupId>org.apache.hive.hcatalog</groupId>
             <artifactId>hive-hcatalog-core</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
@@ -473,16 +479,46 @@
             <artifactId>hive-exec</artifactId>
             <classifier>core</classifier>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-cli</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
diff --git a/docker/integration-tests/integration-tests-spark.yaml b/docker/integration-tests/integration-tests-spark.yaml
index 741287c1660..56ad57ae0aa 100644
--- a/docker/integration-tests/integration-tests-spark.yaml
+++ b/docker/integration-tests/integration-tests-spark.yaml
@@ -17,25 +17,25 @@
 
 version: '2.4'
 services:
-  # spark:
-  #   build:
-  #     context: ../../docker/integration-tests/spark/.
-  #     dockerfile: Dockerfile.master
-  #   environment:
-  #     - INIT_DAEMON_STEP=setup_spark
-  #   ports:
-  #     - 8080:8080
-  #     - 7077:7077
-  # spark-worker:
-  #   build:
-  #     context: ../../docker/integration-tests/spark/.
-  #     dockerfile: Dockerfile.worker
-  #   depends_on:
-  #     - spark
-  #   environment:
-  #     - "SPARK_MASTER=spark://spark:7077"
-  #   ports:
-  #     - 8081:8081
+  spark:
+    build:
+      context: ../../docker/integration-tests/spark/.
+      dockerfile: Dockerfile.master
+    environment:
+      - INIT_DAEMON_STEP=setup_spark
+    ports:
+      - 8080:8080
+      - 7077:7077
+  spark-worker:
+    build:
+      context: ../../docker/integration-tests/spark/.
+      dockerfile: Dockerfile.worker
+    depends_on:
+      - spark
+    environment:
+      - "SPARK_MASTER=spark://spark:7077"
+    ports:
+      - 8081:8081
   namenode:
     build: 
       dockerfile: Dockerfile.hadoop
diff --git a/docker/integration-tests/spark/Dockerfile.master b/docker/integration-tests/spark/Dockerfile.master
index 14e114e3b7d..20f41498852 100644
--- a/docker/integration-tests/spark/Dockerfile.master
+++ b/docker/integration-tests/spark/Dockerfile.master
@@ -20,8 +20,8 @@ ENV ENABLE_INIT_DAEMON false
 ENV INIT_DAEMON_BASE_URI http://identifier/init-daemon
 ENV INIT_DAEMON_STEP spark_master_init
 
-ENV BASE_URL=https://archive.apache.org/dist/spark/
-ENV SPARK_VERSION=3.4.0
+ENV BASE_URL=https://dlcdn.apache.org/spark/
+ENV SPARK_VERSION=3.4.1
 ENV HADOOP_VERSION=3
 ENV SPARK_MASTER_PORT 7077
 ENV SPARK_MASTER_WEBUI_PORT 8080
diff --git a/docker/integration-tests/spark/Dockerfile.worker b/docker/integration-tests/spark/Dockerfile.worker
index 415bba7d4bd..56d5fffc18d 100644
--- a/docker/integration-tests/spark/Dockerfile.worker
+++ b/docker/integration-tests/spark/Dockerfile.worker
@@ -21,8 +21,8 @@ ENV ENABLE_INIT_DAEMON false
 ENV INIT_DAEMON_BASE_URI http://identifier/init-daemon
 ENV INIT_DAEMON_STEP spark_master_init
 
-ENV BASE_URL=https://archive.apache.org/dist/spark/
-ENV SPARK_VERSION=3.4.0
+ENV BASE_URL=https://dlcdn.apache.org/spark/
+ENV SPARK_VERSION=3.4.1
 ENV HADOOP_VERSION=3
 ENV SPARK_WORKER_WEBUI_PORT 8081
 ENV SPARK_WORKER_LOG /spark/logs
diff --git a/plugins/databases/hive/pom.xml b/plugins/databases/hive/pom.xml
index 9d6332974e3..4005c354510 100644
--- a/plugins/databases/hive/pom.xml
+++ b/plugins/databases/hive/pom.xml
@@ -31,7 +31,7 @@
     <name>Hop Plugins Databases Apache Hive</name>
 
     <properties>
-        <hive.version>3.1.3</hive.version>
+        <hive.version>2.3.9</hive.version>
     </properties>
 
     <dependencies>
@@ -62,6 +62,10 @@
                     <groupId>org.glassfish.web</groupId>
                     <artifactId>javax.servlet.jsp</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/plugins/engines/beam/pom.xml b/plugins/engines/beam/pom.xml
index d3647ad23a7..3fe5719b9e1 100644
--- a/plugins/engines/beam/pom.xml
+++ b/plugins/engines/beam/pom.xml
@@ -400,6 +400,12 @@
             <groupId>org.apache.hive.hcatalog</groupId>
             <artifactId>hive-hcatalog-core</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
@@ -411,11 +417,23 @@
             <artifactId>hive-exec</artifactId>
             <classifier>core</classifier>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-cli</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
@@ -427,20 +445,51 @@
             <artifactId>hive-service-rpc</artifactId>
             <version>${hive.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.hive</groupId>
-            <artifactId>hive-standalone-metastore</artifactId>
-            <version>${hive.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
-            <artifactId>hive-spark-client</artifactId>
+            <artifactId>spark-client</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish.web</groupId>
+                    <artifactId>javax.servlet.jsp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jdk.tools</artifactId>
+                    <groupId>jdk.tools</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
diff --git a/pom.xml b/pom.xml
index 72b7c34129a..92cfa71b8f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
         <juniversalchardet.version>2.4.0</juniversalchardet.version>
         <kafka-clients.version>3.3.1</kafka-clients.version>
         <kryo.version>5.3.0</kryo.version>
-        <libthrift.version>0.17.0</libthrift.version>
+        <libthrift.version>0.9.3</libthrift.version>
         <log4j.version>2.19.0</log4j.version>
         <lz4.version>1.8.0</lz4.version>
         <metrics.version>4.2.12</metrics.version>
@@ -184,7 +184,7 @@
         <woodstox.version>6.4.0</woodstox.version>
         <zookeeper.version>3.8.0</zookeeper.version>
         <xerces.version>2.12.2</xerces.version>
-        <hive.version>3.1.3</hive.version>
+        <hive.version>2.3.9</hive.version>
 
         <!-- Test dependencies -->
         <byte-buddy.version>1.12.19</byte-buddy.version>