diff --git a/.github/ISSUE_TEMPLATE/update-product-druid.md b/.github/ISSUE_TEMPLATE/update-product-druid.md
index f2f699738..5fac7a37e 100644
--- a/.github/ISSUE_TEMPLATE/update-product-druid.md
+++ b/.github/ISSUE_TEMPLATE/update-product-druid.md
@@ -27,13 +27,13 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ## Update tasks
 
-- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer)
+- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions (profiles).
+- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer), if compiling against the new Druid version(s) requires changes in the code.
 - [ ] Update `boil-config.toml` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions).
-- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions.
-- [ ] Upload new version (see `druid/upload_new_druid_version.sh`).
-- [ ] Create a file: `druid/stackable/patches/x.y.z/.gitkeep`, add patches if applicable.
-- [ ] Delete old patch directories.
 - [ ] Update `boil-config.toml` to the latest supported version of JVM (base and devel).
+- [ ] Initialize new product versions with patchable and add patches if applicable.
+- [ ] Delete old patch directories.
+- [ ] Check the corresponding operator (getting_started / kuttl / supported-versions) for usage of the versions.
 - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
 - [ ] Ensure prerequisites are up to date (required-external-components.adoc).
 - [ ] Update the version in demos. Add the PR(s) to the list below.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8082e21bd..5712b9fa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 - stackable-base: Add cert-tools ([#1247]).
 - kafka: Add jackson xml dataformat for Kafka 4.0.0 ([#1262]).
 - kafka: Add version `4.1.0` ([#1277]).
+- druid: Add `34.0.0` ([#1263]).
 
 ### Changed
 
@@ -25,11 +26,13 @@ All notable changes to this project will be documented in this file.
 - stackable-devel: Bump ubi9 base image and update cargo-auditable to `0.7.0` ([#1253]).
 - vector: Bump to `0.49.0` ([#1258]).
 - airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
+- druid: Deprecate `33.0.0` ([#1263]).
 
 ### Removed
 
 - opensearch: Stop applying formatting plugin ([#1230]).
 - kafka: Remove version `4.0.0` ([#1277]).
+- druid: Remove `31.0.1` ([#1263]).
 
 [#1207]: https://github.com/stackabletech/docker-images/pull/1207
 [#1215]: https://github.com/stackabletech/docker-images/pull/1215
@@ -46,6 +49,7 @@ All notable changes to this project will be documented in this file.
 [#1262]: https://github.com/stackabletech/docker-images/pull/1262
 [#1264]: https://github.com/stackabletech/docker-images/pull/1264
 [#1277]: https://github.com/stackabletech/docker-images/pull/1277
+[#1263]: https://github.com/stackabletech/docker-images/pull/1263
 
 ## [25.7.0] - 2025-07-23
 
diff --git a/druid/boil-config.toml b/druid/boil-config.toml
index 8a30bc28e..b4c32e4a9 100644
--- a/druid/boil-config.toml
+++ b/druid/boil-config.toml
@@ -7,20 +7,20 @@ java-devel = "17"
 [versions."30.0.1".build-arguments]
 authorizer-version = "0.7.0"
 
-[versions."31.0.1".local-images]
-# https://druid.apache.org/docs/31.0.1/operations/java/
+[versions."33.0.0".local-images]
+# https://druid.apache.org/docs/33.0.0/operations/java/
 java-base = "17"
 java-devel = "17"
 "hadoop/hadoop" = "3.3.6"
 
-[versions."31.0.1".build-arguments]
+[versions."33.0.0".build-arguments]
 authorizer-version = "0.7.0"
 
-[versions."33.0.0".local-images]
-# https://druid.apache.org/docs/33.0.0/operations/java/
+[versions."34.0.0".local-images]
+# https://druid.apache.org/docs/34.0.0/operations/java/
 java-base = "17"
 java-devel = "17"
-"hadoop/hadoop" = "3.3.6"
+"hadoop/hadoop" = "3.4.1"
 
-[versions."33.0.0".build-arguments]
+[versions."34.0.0".build-arguments]
 authorizer-version = "0.7.0"
diff --git a/druid/stackable/patches/31.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch b/druid/stackable/patches/31.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
deleted file mode 100644
index 1a63c96b7..000000000
--- a/druid/stackable/patches/31.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ac257969aaf853835a5a410bb3d432c2b8d9f390 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Wed, 10 Jul 2024 17:07:13 +0200
-Subject: Removes all traces of the druid ranger extension
-
----
- distribution/pom.xml | 2 --
- pom.xml              | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/distribution/pom.xml b/distribution/pom.xml
-index dcb01abceb..1a4f7df716 100644
---- a/distribution/pom.xml
-+++ b/distribution/pom.xml
-@@ -252,8 +252,6 @@
-                                         <argument>-c</argument>
-                                         <argument>org.apache.druid.extensions:druid-pac4j</argument>
-                                         <argument>-c</argument>
--                                        <argument>org.apache.druid.extensions:druid-ranger-security</argument>
--                                        <argument>-c</argument>
-                                         <argument>org.apache.druid.extensions:druid-kubernetes-extensions</argument>
-                                         <argument>-c</argument>
-                                         <argument>org.apache.druid.extensions:druid-catalog</argument>
-diff --git a/pom.xml b/pom.xml
-index e5bcfafacb..807f9f11df 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -198,7 +198,6 @@
-         <module>extensions-core/simple-client-sslcontext</module>
-         <module>extensions-core/druid-basic-security</module>
-         <module>extensions-core/google-extensions</module>
--        <module>extensions-core/druid-ranger-security</module>
-         <module>extensions-core/druid-catalog</module>
-         <module>extensions-core/testing-tools</module>
-         <!-- Community extensions -->
diff --git a/druid/stackable/patches/34.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch b/druid/stackable/patches/34.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
new file mode 100644
index 000000000..fac6e8e30
--- /dev/null
+++ b/druid/stackable/patches/34.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
@@ -0,0 +1,35 @@
+From 515da2a96db1835133e2b367d4c006ce4fcf8a3a Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Mon, 22 Sep 2025 14:20:53 +0200
+Subject: Removes all traces of the druid ranger extension
+
+---
+ distribution/pom.xml | 2 --
+ pom.xml              | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/distribution/pom.xml b/distribution/pom.xml
+index f7e9766494..7c2573fbd4 100644
+--- a/distribution/pom.xml
++++ b/distribution/pom.xml
+@@ -460,8 +460,6 @@
+                                         <argument>org.apache.druid.extensions.contrib:druid-rabbit-indexing-service</argument>
+                                         <argument>-c</argument>
+                                         <argument>org.apache.druid.extensions.contrib:grpc-query</argument>
+-                                        <argument>-c</argument>
+-                                        <argument>org.apache.druid.extensions.contrib:druid-ranger-security</argument>
+                                     </arguments>
+                                 </configuration>
+                             </execution>
+diff --git a/pom.xml b/pom.xml
+index 35ebdfdc34..829ddbd9e7 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -260,7 +260,6 @@
+         <module>extensions-contrib/druid-deltalake-extensions</module>
+         <module>extensions-contrib/spectator-histogram</module>
+         <module>extensions-contrib/rabbit-stream-indexing-service</module>
+-        <module>extensions-contrib/druid-ranger-security</module>
+         <!-- distribution packaging -->
+         <module>distribution</module>
+         <!-- Revised integration tests -->
diff --git a/druid/stackable/patches/31.0.1/0002-Include-Prometheus-emitter-in-distribution.patch b/druid/stackable/patches/34.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
similarity index 93%
rename from druid/stackable/patches/31.0.1/0002-Include-Prometheus-emitter-in-distribution.patch
rename to druid/stackable/patches/34.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
index beb5f4e94..d6a649fff 100644
--- a/druid/stackable/patches/31.0.1/0002-Include-Prometheus-emitter-in-distribution.patch
+++ b/druid/stackable/patches/34.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
@@ -1,6 +1,6 @@
-From 484bd7f13890823fdfdcbec5bd21b046ac885015 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:34 +0100
+From c836d04ca08c6f341817096dcca7d8231c25ed66 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Mon, 22 Sep 2025 14:23:11 +0200
 Subject: Include Prometheus emitter in distribution
 
 ---
@@ -8,10 +8,10 @@ Subject: Include Prometheus emitter in distribution
  1 file changed, 46 insertions(+)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index 1a4f7df716..a28e34bb6a 100644
+index 7c2573fbd4..21954e8fb4 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -464,6 +464,52 @@
+@@ -468,6 +468,52 @@
                  </plugins>
              </build>
          </profile>
diff --git a/druid/stackable/patches/31.0.1/0003-Stop-building-unused-extensions.patch b/druid/stackable/patches/34.0.0/0003-Stop-building-unused-extensions.patch
similarity index 79%
rename from druid/stackable/patches/31.0.1/0003-Stop-building-unused-extensions.patch
rename to druid/stackable/patches/34.0.0/0003-Stop-building-unused-extensions.patch
index 97fc3b900..03de5eaca 100644
--- a/druid/stackable/patches/31.0.1/0003-Stop-building-unused-extensions.patch
+++ b/druid/stackable/patches/34.0.0/0003-Stop-building-unused-extensions.patch
@@ -1,26 +1,23 @@
-From 540182e6a1169103cb77ff37d963186f23204800 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:34 +0100
+From 8a1e8f9c4eaa419bb59825e645cbacd0b4ec7d34 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:31:00 +0200
 Subject: Stop building unused extensions.
 
 By default Druid builds all community extensions and then discards them
 while assembling the final distribution. This patch removes unused
 extensions from the build.
 ---
- pom.xml | 32 +-------------------------------
- 1 file changed, 1 insertion(+), 31 deletions(-)
+ pom.xml | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 807f9f11df..e9e19f7920 100644
+index 829ddbd9e7..369550e166 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -200,39 +200,9 @@
-         <module>extensions-core/google-extensions</module>
-         <module>extensions-core/druid-catalog</module>
+@@ -229,37 +229,8 @@
          <module>extensions-core/testing-tools</module>
-+
          <!-- Community extensions -->
--        <module>extensions-contrib/compressed-bigdecimal</module>
+         <module>extensions-contrib/compressed-bigdecimal</module>
 -        <module>extensions-contrib/influx-extensions</module>
 -        <module>extensions-contrib/cassandra-storage</module>
 -        <module>extensions-contrib/dropwizard-emitter</module>
@@ -33,7 +30,7 @@ index 807f9f11df..e9e19f7920 100644
 -        <module>extensions-contrib/thrift-extensions</module>
 -        <module>extensions-contrib/ambari-metrics-emitter</module>
 -        <module>extensions-contrib/sqlserver-metadata-storage</module>
--        <module>extensions-contrib/kafka-emitter</module>
+         <module>extensions-contrib/kafka-emitter</module>
 -        <module>extensions-contrib/redis-cache</module>
 -        <module>extensions-contrib/opentsdb-emitter</module>
 -        <module>extensions-contrib/materialized-view-maintenance</module>
@@ -47,11 +44,11 @@ index 807f9f11df..e9e19f7920 100644
 -        <module>extensions-contrib/aliyun-oss-extensions</module>
          <module>extensions-contrib/prometheus-emitter</module>
 -        <module>extensions-contrib/opentelemetry-emitter</module>
--        <module>extensions-contrib/kubernetes-overlord-extensions</module>
+-        <module>extensions-contrib/grpc-query</module>
 -        <module>extensions-contrib/druid-iceberg-extensions</module>
 -        <module>extensions-contrib/druid-deltalake-extensions</module>
 -        <module>extensions-contrib/spectator-histogram</module>
 -        <module>extensions-contrib/rabbit-stream-indexing-service</module>
- 
          <!-- distribution packaging -->
          <module>distribution</module>
+         <!-- Revised integration tests -->
diff --git a/druid/stackable/patches/31.0.1/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch b/druid/stackable/patches/34.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
similarity index 66%
rename from druid/stackable/patches/31.0.1/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
rename to druid/stackable/patches/34.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
index f6d435ab6..1196b2554 100644
--- a/druid/stackable/patches/31.0.1/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
+++ b/druid/stackable/patches/34.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
@@ -1,19 +1,18 @@
-From 14918ed4cad073b1e62ba26111352dafd2da3ae0 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:49 +0100
+From 90757e20d151e2744f5206df1f6b9fdc1992d78a Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:42:23 +0200
 Subject: Updates all dependencies that have a new patch release available.
 
 ---
  extensions-core/druid-pac4j/pom.xml           |  2 +-
  extensions-core/kubernetes-extensions/pom.xml |  2 +-
  extensions-core/orc-extensions/pom.xml        |  2 +-
- extensions-core/parquet-extensions/pom.xml    |  2 +-
- pom.xml                                       | 31 ++++++++++---------
+ pom.xml                                       | 24 ++++++++++++-------
  processing/pom.xml                            |  2 +-
- 6 files changed, 22 insertions(+), 19 deletions(-)
+ 5 files changed, 19 insertions(+), 13 deletions(-)
 
 diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml
-index 3693d28d67..8be5e4c355 100644
+index 8e742e5f17..f5836cb8a4 100644
 --- a/extensions-core/druid-pac4j/pom.xml
 +++ b/extensions-core/druid-pac4j/pom.xml
 @@ -34,7 +34,7 @@
@@ -26,7 +25,7 @@ index 3693d28d67..8be5e4c355 100644
      <!-- Following must be updated along with any updates to pac4j version. One can find the compatible version of nimbus libraries in org.pac4j:pac4j-oidc dependencies-->
      <nimbus.lang.tag.version>1.7</nimbus.lang.tag.version>
 diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml
-index 1e513ec8eb..7f43fdd108 100644
+index 9e9ddfd458..1ef515a68f 100644
 --- a/extensions-core/kubernetes-extensions/pom.xml
 +++ b/extensions-core/kubernetes-extensions/pom.xml
 @@ -34,7 +34,7 @@
@@ -39,7 +38,7 @@ index 1e513ec8eb..7f43fdd108 100644
  
  
 diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml
-index 1b6a394728..bb4a9be716 100644
+index 656f34134f..376337f009 100644
 --- a/extensions-core/orc-extensions/pom.xml
 +++ b/extensions-core/orc-extensions/pom.xml
 @@ -31,7 +31,7 @@
@@ -51,93 +50,80 @@ index 1b6a394728..bb4a9be716 100644
      </properties>
      <dependencies>
          <dependency>
-diff --git a/extensions-core/parquet-extensions/pom.xml b/extensions-core/parquet-extensions/pom.xml
-index 0d18d9162d..a8f9e7d52e 100644
---- a/extensions-core/parquet-extensions/pom.xml
-+++ b/extensions-core/parquet-extensions/pom.xml
-@@ -201,7 +201,7 @@
-         </dependency>
-       </dependencies>
-       <properties>
--        <parquet.version>1.13.0</parquet.version>
-+        <parquet.version>1.13.1</parquet.version>
-       </properties>
-     </profile>
-   </profiles>
 diff --git a/pom.xml b/pom.xml
-index e9e19f7920..4408e55b9c 100644
+index 369550e166..ae6f8f9c15 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -74,7 +74,7 @@
-         <maven.compiler.target>1.8</maven.compiler.target>
-         <java.version>8</java.version>
+@@ -73,7 +73,7 @@
+         <java.version>11</java.version>
+         <maven.compiler.release>${java.version}</maven.compiler.release>
          <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 -        <aether.version>0.9.0.M2</aether.version>
 +        <aether.version>0.9.1.v20140329</aether.version>
-         <apache.curator.version>5.5.0</apache.curator.version>
-         <apache.kafka.version>3.9.0</apache.kafka.version>
+         <apache.curator.version>5.8.0</apache.curator.version>
+         <apache.kafka.version>3.9.1</apache.kafka.version>
          <!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
-@@ -90,24 +90,27 @@
-         <calcite.version>1.37.0</calcite.version>
-         <confluent.version>6.2.12</confluent.version>
+@@ -90,11 +90,14 @@
+         <confluent.version>6.2.15</confluent.version>
+         <cronutils.version>9.2.0</cronutils.version>
          <datasketches.version>4.2.0</datasketches.version>
 -        <datasketches.memory.version>2.2.0</datasketches.memory.version>
 +        <datasketches.memory.version>2.2.1</datasketches.memory.version>
          <derby.version>10.14.2.0</derby.version>
 -        <dropwizard.metrics.version>4.2.22</dropwizard.metrics.version>
 +        <dropwizard.metrics.version>4.2.30</dropwizard.metrics.version>
-         <errorprone.version>2.20.0</errorprone.version>
+         <errorprone.version>2.35.1</errorprone.version>
 -        <fastutil.version>8.5.4</fastutil.version>
 +        <!-- An additional null check was introduced in fastutils 8.5.7 that breaks data ingestion tasks:
 +             https://github.com/stackabletech/druid-operator/issues/595
 +             https://github.com/vigna/fastutil/commit/598a4fd064e193be69ea324aa86947477c82ede8 -->
 +        <fastutil.version>8.5.6</fastutil.version>
-         <guava.version>32.0.1-jre</guava.version>
-         <guice.version>4.1.0</guice.version>
+         <guava.version>32.1.3-jre</guava.version>
+         <guice.version>5.1.0</guice.version>
          <hamcrest.version>1.3</hamcrest.version>
--        <jetty.version>9.4.56.v20240826</jetty.version>
-+        <jetty.version>9.4.57.v20241219</jetty.version>
+@@ -102,13 +105,13 @@
          <jersey.version>1.19.4</jersey.version>
--        <jackson.version>2.12.7.20221012</jackson.version>
+         <jackson.core.version>2.18.4.1</jackson.core.version>
+         <jackson.version>2.18.4</jackson.version>
 -        <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
-+        <jackson.version>2.12.7.20240502</jackson.version>
 +        <codehaus.jackson.version>1.9.14-MULE-002</codehaus.jackson.version>
          <log4j.version>2.22.1</log4j.version>
          <mysql.version>8.2.0</mysql.version>
          <mariadb.version>2.7.3</mariadb.version>
          <netty3.version>3.10.6.Final</netty3.version>
--        <netty4.version>4.1.108.Final</netty4.version>
+         <netty4.version>4.1.122.Final</netty4.version>
 -        <postgresql.version>42.7.2</postgresql.version>
-+        <netty4.version>4.1.117.Final</netty4.version>
 +        <postgresql.version>42.7.5</postgresql.version>
          <protobuf.version>3.25.5</protobuf.version>
          <resilience4j.version>1.3.1</resilience4j.version>
-         <slf4j.version>1.7.36</slf4j.version>
-@@ -118,17 +121,17 @@
-         <!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17),
-              however it is required in some cases when running against mockito 4.x (mockito 4.x is required for Java <11. We use the following property to pick the proper artifact based on Java version (see pre-java-11 profile) -->
-         <mockito.inline.artifact>core</mockito.inline.artifact>
--        <aws.sdk.version>1.12.638</aws.sdk.version>
+         <slf4j.version>2.0.16</slf4j.version>
+@@ -117,18 +120,21 @@
+         <hadoop.compile.version>3.3.6</hadoop.compile.version>
+         <graaljs.version>22.3.5</graaljs.version>
+         <mockito.version>5.14.2</mockito.version>
++        <!-- mockito-inline artifact was removed in mockito 5.3 (mockito 5.x is required for Java >17),
++             however it is required in some cases when running against mockito 4.x (mockito 4.x is required for Java <11. We use the following property to pick the proper artifact based on Java version (see pre-java-11 profile) -->
++        <mockito.inline.artifact>core</mockito.inline.artifact>
+         <aws.sdk.version>1.12.784</aws.sdk.version>
 -        <caffeine.version>2.8.0</caffeine.version>
--        <jacoco.version>0.8.7</jacoco.version>
-+        <aws.sdk.version>1.12.780</aws.sdk.version>
 +        <caffeine.version>2.8.8</caffeine.version>
-+        <jacoco.version>0.8.12</jacoco.version>
+         <jacoco.version>0.8.12</jacoco.version>
+         <testcontainers.version>1.21.3</testcontainers.version>
          <hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
 -        <httpclient.version>4.5.13</httpclient.version>
 +        <httpclient.version>4.5.14</httpclient.version>
          <!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) -->
          <zookeeper.version>3.8.4</zookeeper.version>
-         <checkerframework.version>2.5.7</checkerframework.version>
+         <checkerframework.version>3.48.1</checkerframework.version>
          <com.google.apis.client.version>2.2.0</com.google.apis.client.version>
          <com.google.http.client.apis.version>1.42.3</com.google.http.client.apis.version>
 -        <com.google.apis.compute.version>v1-rev20230606-2.0.0</com.google.apis.compute.version>
 +        <com.google.apis.compute.version>v1-rev20250107-2.0.0</com.google.apis.compute.version>
          <com.google.cloud.storage.version>2.29.1</com.google.cloud.storage.version>
-         <jdk.strong.encapsulation.argLine><!-- empty placeholder --></jdk.strong.encapsulation.argLine>
-         <jdk.security.manager.allow.argLine><!-- empty placeholder --></jdk.security.manager.allow.argLine>
+         <jdk.strong.encapsulation.argLine>
+             <!-- Strong encapsulation parameters -->
 diff --git a/processing/pom.xml b/processing/pom.xml
-index d5418dce93..716c1299f4 100644
+index 05232d48c1..a10f42d189 100644
 --- a/processing/pom.xml
 +++ b/processing/pom.xml
 @@ -36,7 +36,7 @@
diff --git a/druid/stackable/patches/31.0.1/0005-Include-jackson-dataformat-xml-dependency.patch b/druid/stackable/patches/34.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
similarity index 72%
rename from druid/stackable/patches/31.0.1/0005-Include-jackson-dataformat-xml-dependency.patch
rename to druid/stackable/patches/34.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
index 1a469fef8..87678a6f1 100644
--- a/druid/stackable/patches/31.0.1/0005-Include-jackson-dataformat-xml-dependency.patch
+++ b/druid/stackable/patches/34.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
@@ -1,6 +1,6 @@
-From bb1dd6ace9f6112532e5c4ad7158f0703b5baf9a Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:49 +0100
+From 602c632042726fb4f71302d18144b540df8b42e9 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:42:41 +0200
 Subject: Include jackson-dataformat-xml dependency.
 
 This allows us to use XmlLayout for Log4jV2.
@@ -12,12 +12,12 @@ build.
  1 file changed, 5 insertions(+)
 
 diff --git a/server/pom.xml b/server/pom.xml
-index 8f1bb2bd72..4c443f9ac4 100644
+index fbe2a2a480..f099199c01 100644
 --- a/server/pom.xml
 +++ b/server/pom.xml
-@@ -205,6 +205,11 @@
-             <groupId>org.apache.logging.log4j</groupId>
-             <artifactId>log4j-core</artifactId>
+@@ -218,6 +218,11 @@
+             <artifactId>checker-qual</artifactId>
+             <version>${checkerframework.version}</version>
          </dependency>
 +        <dependency>
 +          <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
diff --git a/druid/stackable/patches/31.0.1/0006-Stop-building-the-tar.gz-distribution.patch b/druid/stackable/patches/34.0.0/0006-Stop-building-the-tar.gz-distribution.patch
similarity index 84%
rename from druid/stackable/patches/31.0.1/0006-Stop-building-the-tar.gz-distribution.patch
rename to druid/stackable/patches/34.0.0/0006-Stop-building-the-tar.gz-distribution.patch
index 41fc73a3f..ab78fdd3a 100644
--- a/druid/stackable/patches/31.0.1/0006-Stop-building-the-tar.gz-distribution.patch
+++ b/druid/stackable/patches/34.0.0/0006-Stop-building-the-tar.gz-distribution.patch
@@ -1,6 +1,6 @@
-From e91413a596de7c72e659a0da45522f8d84a6372b Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Mon, 17 Feb 2025 16:42:49 +0100
+From 781c8de56f5b6f0d050133f268cff7f9a1bceec9 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:42:51 +0200
 Subject: Stop building the tar.gz distribution.
 
 All we do is build Druid tar and gzip it only to immediately uncompress it
diff --git a/druid/stackable/patches/31.0.1/0007-Update-CycloneDX-plugin.patch b/druid/stackable/patches/34.0.0/0007-Update-CycloneDX-plugin.patch
similarity index 76%
rename from druid/stackable/patches/31.0.1/0007-Update-CycloneDX-plugin.patch
rename to druid/stackable/patches/34.0.0/0007-Update-CycloneDX-plugin.patch
index 52880e32c..88f2980be 100644
--- a/druid/stackable/patches/31.0.1/0007-Update-CycloneDX-plugin.patch
+++ b/druid/stackable/patches/34.0.0/0007-Update-CycloneDX-plugin.patch
@@ -1,6 +1,6 @@
-From 245dbf0bff4e386db6b27d079fe5baff6180732c Mon Sep 17 00:00:00 2001
-From: Lukas Voetmand <lukas.voetmand@stackable.tech>
-Date: Fri, 6 Sep 2024 17:53:52 +0200
+From e21f0654a1a9f62cb5a679713bb3c6448396b1c5 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:43:11 +0200
 Subject: Update CycloneDX plugin
 
 ---
@@ -8,10 +8,10 @@ Subject: Update CycloneDX plugin
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/pom.xml b/pom.xml
-index 4408e55b9c..5c99e69381 100644
+index ae6f8f9c15..83f10a4513 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1707,7 +1707,11 @@
+@@ -1817,7 +1817,11 @@
              <plugin>
                  <groupId>org.cyclonedx</groupId>
                  <artifactId>cyclonedx-maven-plugin</artifactId>
diff --git a/druid/stackable/patches/31.0.1/0008-Fix-CVE-2024-36114.patch b/druid/stackable/patches/34.0.0/0008-Fix-CVE-2024-36114.patch
similarity index 89%
rename from druid/stackable/patches/31.0.1/0008-Fix-CVE-2024-36114.patch
rename to druid/stackable/patches/34.0.0/0008-Fix-CVE-2024-36114.patch
index 5915ad3a9..f1482637f 100644
--- a/druid/stackable/patches/31.0.1/0008-Fix-CVE-2024-36114.patch
+++ b/druid/stackable/patches/34.0.0/0008-Fix-CVE-2024-36114.patch
@@ -1,6 +1,6 @@
-From f36f1491c4d3658a8ebdc74e90fdbfa949546abe Mon Sep 17 00:00:00 2001
-From: Malte Sander <malte.sander.it@gmail.com>
-Date: Thu, 12 Dec 2024 17:59:17 +0100
+From 224add10a0b0cac239ba44d0a7e576ae715acc72 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:43:28 +0200
 Subject: Fix CVE-2024-36114
 
 Fix CVE-2024-36114
@@ -27,10 +27,10 @@ known workarounds for this issue.
  1 file changed, 6 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index 5c99e69381..88fdfcb09a 100644
+index 83f10a4513..c07e203713 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -256,6 +256,12 @@
+@@ -287,6 +287,12 @@
      </pluginRepositories>
      <dependencyManagement>
          <dependencies>
diff --git a/druid/stackable/patches/31.0.1/0009-Update-FMPP-version.patch b/druid/stackable/patches/34.0.0/0009-Update-FMPP-version.patch
similarity index 74%
rename from druid/stackable/patches/31.0.1/0009-Update-FMPP-version.patch
rename to druid/stackable/patches/34.0.0/0009-Update-FMPP-version.patch
index 0d8883141..baf268458 100644
--- a/druid/stackable/patches/31.0.1/0009-Update-FMPP-version.patch
+++ b/druid/stackable/patches/34.0.0/0009-Update-FMPP-version.patch
@@ -1,21 +1,21 @@
-From 15f604cc0c9f953df95be8a4c38d5dcc0b595051 Mon Sep 17 00:00:00 2001
-From: Lars Francke <git@lars-francke.de>
-Date: Thu, 12 Dec 2024 06:35:21 +0100
+From a520812e38cad3613b1b1a096cd0fc8ef7e420c7 Mon Sep 17 00:00:00 2001
+From: xeniape <xenia.fischer@stackable.tech>
+Date: Tue, 23 Sep 2025 09:43:41 +0200
 Subject: Update FMPP version
 
 This is because FMPP Maven Plugin depends on FMPP in version 0.9.14
 which itself depends on a Freemarker version that has not been pinned.
-Instead it specifies a "range" which resolves to a SNAPSHOT version
+Instead it specifies a range which resolves to a SNAPSHOT version
 which we don't want.
 ---
  sql/pom.xml | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/sql/pom.xml b/sql/pom.xml
-index 56ed03f5c2..d0d19dd854 100644
+index 1fe6cf3389..02db6e49fb 100644
 --- a/sql/pom.xml
 +++ b/sql/pom.xml
-@@ -365,6 +365,13 @@
+@@ -364,6 +364,13 @@
        <plugin>
          <groupId>com.googlecode.fmpp-maven-plugin</groupId>
          <artifactId>fmpp-maven-plugin</artifactId>
diff --git a/druid/stackable/patches/31.0.1/patchable.toml b/druid/stackable/patches/34.0.0/patchable.toml
similarity index 51%
rename from druid/stackable/patches/31.0.1/patchable.toml
rename to druid/stackable/patches/34.0.0/patchable.toml
index 63a03b2f9..c079a70cf 100644
--- a/druid/stackable/patches/31.0.1/patchable.toml
+++ b/druid/stackable/patches/34.0.0/patchable.toml
@@ -1,2 +1,2 @@
-base = "520482cb9638e452b0553595b4f29bb397a63758"
 mirror = "https://github.com/stackabletech/druid.git"
+base = "aa107ecd801a1f1c31e9965ee020f2cea9bda613"