diff --git a/CHANGELOG.md b/CHANGELOG.md
index 015ab16ae..2d112c6f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 - airflow: Add `2.10.5` ([#1108]).
 - druid: check for correct permissions and ownerships in /stackable folder via
   `check-permissions-ownership.sh` provided in stackable-base image ([#1039]).
+- druid: Add `33.0.0` ([#1110]).
 - hadoop: check for correct permissions and ownerships in /stackable folder via
   `check-permissions-ownership.sh` provided in stackable-base image ([#1029]).
 - hbase: check for correct permissions and ownerships in /stackable folder via
@@ -78,6 +79,7 @@ All notable changes to this project will be documented in this file.
 - Remove ubi8-rust-builder image ([#1091]).
 - opa: Remove `0.67.1` ([#1103]).
 - opa: Remove legacy bundle-builder from container build ([#1103]).
+- druid: Remove `30.0.0` ([#1110]).
 
 [#1025]: https://github.com/stackabletech/docker-images/pull/1025
 [#1027]: https://github.com/stackabletech/docker-images/pull/1027
@@ -107,6 +109,7 @@ All notable changes to this project will be documented in this file.
 [#1103]: https://github.com/stackabletech/docker-images/pull/1103
 [#1106]: https://github.com/stackabletech/docker-images/pull/1106
 [#1108]: https://github.com/stackabletech/docker-images/pull/1108
+[#1110]: https://github.com/stackabletech/docker-images/pull/1110
 [#1116]: https://github.com/stackabletech/docker-images/pull/1116
 
 ## [25.3.0] - 2025-03-21
diff --git a/druid/Dockerfile b/druid/Dockerfile
index 7acb8f3f1..2c8b52ca9 100644
--- a/druid/Dockerfile
+++ b/druid/Dockerfile
@@ -43,13 +43,29 @@ COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/${PRODUCT} /stackab
 # with a "directory not empty" error on the first builder to finish, as other builders
 # are still working in the cache directory.
 
+# Let's have patchable as a dedicated step, as it fetches the druid sourcecode over the network,
+# thus taking a bit (which is annoying while development)
+RUN /stackable/patchable --images-repo-root=src checkout druid ${PRODUCT} > /tmp/DRUID_SOURCE_DIR
+
 RUN --mount=type=cache,id=maven-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository \
   --mount=type=cache,id=npm-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.npm \
   --mount=type=cache,id=cache-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.cache \
   <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout druid ${PRODUCT})"
+cd "$(cat /tmp/DRUID_SOURCE_DIR)" || exit 1
+rm /tmp/DRUID_SOURCE_DIR
+
+mvn \
+  --batch-mode \
+  --no-transfer-progress \
+  clean install \
+  -Pdist,stackable-bundle-contrib-exts \
+  -Dmaven.test.skip `# Skip test compilation` \
+  -DskipTests `# Skip test execution` \
+  -Dcheckstyle.skip `# Skip checkstyle checks. We dont care if the code is properly formatted, it just wastes time` \
+  -Dmaven.javadoc.skip=true `# Dont generate javadoc` \
+  -Dmaven.gitcommitid.skip=true `# The gitcommitid plugin cannot work with git workspaces (ie: patchable)` \
+  $(if [[ ${PRODUCT} != 30.* ]]; then echo --projects '!quidem-ut'; fi) `# This is just a maven module for tests. https://github.com/apache/druid/pull/16867 added https://raw.githubusercontent.com/kgyrtkirk/datasets/repo/ as a Maven repository, which fails to pull for us (Failed to execute goal on project druid-quidem-ut: Could not resolve dependencies for project org.apache.druid:druid-quidem-ut:jar:33.0.0: com.github.kgyrtkirk.datasets:kttm-nested:jar:0.1 was not found in https://build-repo.stackable.tech/repository/maven-public/). By disabling the maven module we dont pull in this weird dependency...`
 
-mvn --batch-mode --no-transfer-progress clean install -Pdist,stackable-bundle-contrib-exts -DskipTests -Dmaven.javadoc.skip=true
 mv distribution/target/apache-druid-${PRODUCT}-bin/apache-druid-${PRODUCT} /stackable/
 mv distribution/target/bom.json /stackable/apache-druid-${PRODUCT}/apache-druid-${PRODUCT}.cdx.json
 rm -rf /stackable/apache-druid-${PRODUCT}-src
diff --git a/druid/stackable/patches/30.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch b/druid/stackable/patches/30.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
deleted file mode 100644
index cbbe1578a..000000000
--- a/druid/stackable/patches/30.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b6665733d54d730bafcd4c238b11bedd4e412667 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 bdbbd8b4c0..e27329e96d 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 9051ed24c5..3ab467e468 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/30.0.0/patchable.toml b/druid/stackable/patches/30.0.0/patchable.toml
deleted file mode 100644
index 53c505db4..000000000
--- a/druid/stackable/patches/30.0.0/patchable.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-base = "09d36ee324747f1407705c27618b6d415c3fa8a9"
-mirror = "https://github.com/stackabletech/druid.git"
diff --git a/druid/stackable/patches/33.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch b/druid/stackable/patches/33.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
new file mode 100644
index 000000000..02492d053
--- /dev/null
+++ b/druid/stackable/patches/33.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch
@@ -0,0 +1,35 @@
+From 0517d9fb940879ced639eb0d717ba4b5f67d9670 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 8ee50f9029..cb54001d20 100644
+--- a/distribution/pom.xml
++++ b/distribution/pom.xml
+@@ -458,8 +458,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 1f7d6a69df..09daa8b2e9 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -258,7 +258,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/30.0.0/0002-Include-Prometheus-emitter-in-distribution.patch b/druid/stackable/patches/33.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
similarity index 96%
rename from druid/stackable/patches/30.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
rename to druid/stackable/patches/33.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
index f0f99bd7e..139726873 100644
--- a/druid/stackable/patches/30.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
+++ b/druid/stackable/patches/33.0.0/0002-Include-Prometheus-emitter-in-distribution.patch
@@ -1,4 +1,4 @@
-From 0cee640900bb8119ba6be12911578927aeb191ed Mon Sep 17 00:00:00 2001
+From 7cd9440c7f484db79ca4a7b107fc0404dc9421a0 Mon Sep 17 00:00:00 2001
 From: Lars Francke <git@lars-francke.de>
 Date: Mon, 17 Feb 2025 16:42:34 +0100
 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 e27329e96d..d5918710ef 100644
+index cb54001d20..c8b7e13054 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -464,6 +464,52 @@
+@@ -466,6 +466,52 @@
                  </plugins>
              </build>
          </profile>
diff --git a/druid/stackable/patches/30.0.0/0003-Stop-building-unused-extensions.patch b/druid/stackable/patches/33.0.0/0003-Stop-building-unused-extensions.patch
similarity index 87%
rename from druid/stackable/patches/30.0.0/0003-Stop-building-unused-extensions.patch
rename to druid/stackable/patches/33.0.0/0003-Stop-building-unused-extensions.patch
index 9ff62ae78..7da10598a 100644
--- a/druid/stackable/patches/30.0.0/0003-Stop-building-unused-extensions.patch
+++ b/druid/stackable/patches/33.0.0/0003-Stop-building-unused-extensions.patch
@@ -1,4 +1,4 @@
-From 62f340d66dae20da8d7566f992b56223d29d4174 Mon Sep 17 00:00:00 2001
+From 2259629e248db402a660b42d7eca75f17e164b7f Mon Sep 17 00:00:00 2001
 From: Lars Francke <git@lars-francke.de>
 Date: Mon, 17 Feb 2025 16:42:34 +0100
 Subject: Stop building unused extensions.
@@ -7,18 +7,16 @@ 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 | 31 -------------------------------
+ 1 file changed, 31 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 3ab467e468..171a98f803 100644
+index 09daa8b2e9..df781fac63 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -200,39 +200,9 @@
-         <module>extensions-core/google-extensions</module>
+@@ -226,38 +226,7 @@
          <module>extensions-core/druid-catalog</module>
          <module>extensions-core/testing-tools</module>
-+
          <!-- Community extensions -->
 -        <module>extensions-contrib/compressed-bigdecimal</module>
 -        <module>extensions-contrib/influx-extensions</module>
@@ -47,11 +45,11 @@ index 3ab467e468..171a98f803 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/30.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch b/druid/stackable/patches/33.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
similarity index 59%
rename from druid/stackable/patches/30.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
rename to druid/stackable/patches/33.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
index 7a78bdf3b..a8e0d43f9 100644
--- a/druid/stackable/patches/30.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
+++ b/druid/stackable/patches/33.0.0/0004-Updates-all-dependencies-that-have-a-new-patch-relea.patch
@@ -1,35 +1,31 @@
-From 59ce2824b13ad95f728a5a5afc1e5b18ff547a38 Mon Sep 17 00:00:00 2001
+From 14b8c8cb1ce5e458ca8d1ff3cafa8adfa86c6c91 Mon Sep 17 00:00:00 2001
 From: Lars Francke <git@lars-francke.de>
 Date: Mon, 17 Feb 2025 16:42:49 +0100
 Subject: Updates all dependencies that have a new patch release available.
 
 ---
- extensions-core/druid-pac4j/pom.xml           |  5 +++-
+ 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                                       | 29 ++++++++++---------
+ pom.xml                                       | 28 +++++++++++--------
  processing/pom.xml                            |  2 +-
- 6 files changed, 24 insertions(+), 18 deletions(-)
+ 5 files changed, 21 insertions(+), 15 deletions(-)
 
 diff --git a/extensions-core/druid-pac4j/pom.xml b/extensions-core/druid-pac4j/pom.xml
-index 88a570fd72..d3714ca0e2 100644
+index 7f20428b10..b11e324c6a 100644
 --- a/extensions-core/druid-pac4j/pom.xml
 +++ b/extensions-core/druid-pac4j/pom.xml
-@@ -38,7 +38,10 @@
+@@ -34,7 +34,7 @@
+   </parent>
+ 
+   <properties>
+-    <pac4j.version>4.5.7</pac4j.version>
++    <pac4j.version>4.5.8</pac4j.version>
  
      <!-- 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>
--    <nimbus.jose.jwt.version>9.37.2</nimbus.jose.jwt.version>
-+    <!-- A breaking change was introduced in nimbus-jose-jwt 9.0 where net.minidev.json.JSONObject method arguments and return types were replaced, causing errors during OIDC callback:
-+         https://github.com/stackabletech/druid-operator/issues/595
-+         https://bitbucket.org/connect2id/nimbus-jose-jwt/src/9.0/CHANGELOG.txt -->
-+    <nimbus.jose.jwt.version>8.22.1</nimbus.jose.jwt.version>
-     <oauth2.oidc.sdk.version>8.22</oauth2.oidc.sdk.version>
-   </properties>
- 
 diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml
-index 8bf105ea86..d445888da1 100644
+index a910172cae..549de276f7 100644
 --- a/extensions-core/kubernetes-extensions/pom.xml
 +++ b/extensions-core/kubernetes-extensions/pom.xml
 @@ -34,7 +34,7 @@
@@ -37,12 +33,12 @@ index 8bf105ea86..d445888da1 100644
  
    <properties>
 -    <kubernetes.client.version>19.0.0</kubernetes.client.version>
-+    <kubernetes.client.version>19.0.1</kubernetes.client.version>
++    <kubernetes.client.version>19.0.2</kubernetes.client.version>
    </properties>
  
  
 diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml
-index ade9bd8f37..db0ad77894 100644
+index c790639e41..9fb910a86f 100644
 --- a/extensions-core/orc-extensions/pom.xml
 +++ b/extensions-core/orc-extensions/pom.xml
 @@ -31,7 +31,7 @@
@@ -50,97 +46,84 @@ index ade9bd8f37..db0ad77894 100644
      <modelVersion>4.0.0</modelVersion>
      <properties>
 -        <orc.version>1.7.6</orc.version>
-+        <orc.version>1.7.10</orc.version>
++        <orc.version>1.7.11</orc.version>
      </properties>
      <dependencies>
          <dependency>
-diff --git a/extensions-core/parquet-extensions/pom.xml b/extensions-core/parquet-extensions/pom.xml
-index d3404a62d2..9cbb6d51d5 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 171a98f803..38c6b8dbb5 100644
+index df781fac63..7a7cbea9de 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.6.1</apache.kafka.version>
+         <apache.kafka.version>3.9.0</apache.kafka.version>
          <!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
-@@ -91,25 +91,28 @@
-         <calcite.version>1.35.0</calcite.version>
+@@ -90,24 +90,27 @@
          <confluent.version>6.2.12</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.26</dropwizard.metrics.version>
-         <errorprone.version>2.20.0</errorprone.version>
++        <dropwizard.metrics.version>4.2.30</dropwizard.metrics.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>
+         <guice.version>5.1.0</guice.version>
          <hamcrest.version>1.3</hamcrest.version>
-         <jetty.version>9.4.54.v20240208</jetty.version>
+         <jetty.version>9.4.57.v20241219</jetty.version>
          <jersey.version>1.19.4</jersey.version>
 -        <jackson.version>2.12.7.20221012</jackson.version>
+-        <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
 +        <jackson.version>2.12.7.20240502</jackson.version>
-         <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
++        <codehaus.jackson.version>1.9.14-MULE-002</codehaus.jackson.version>
          <log4j.version>2.22.1</log4j.version>
-         <mysql.version>5.1.49</mysql.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.118.Final</netty4.version>
 -        <postgresql.version>42.7.2</postgresql.version>
--        <protobuf.version>3.24.0</protobuf.version>
-+        <netty4.version>4.1.111.Final</netty4.version>
-+        <postgresql.version>42.7.3</postgresql.version>
-+        <protobuf.version>3.24.4</protobuf.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>
-         <jna.version>5.13.0</jna.version>
-@@ -119,17 +122,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>
+@@ -116,17 +119,20 @@
+         <hadoop.compile.version>3.3.6</hadoop.compile.version>
+         <graaljs.version>22.3.5</graaljs.version>
+         <mockito.version>5.14.2</mockito.version>
 -        <aws.sdk.version>1.12.638</aws.sdk.version>
 -        <caffeine.version>2.8.0</caffeine.version>
--        <jacoco.version>0.8.7</jacoco.version>
-+        <aws.sdk.version>1.12.754</aws.sdk.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.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>
          <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-rev20240618-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 3a62790fb0..c3afa9fd27 100644
+index a43f1262d0..8cc22d5195 100644
 --- a/processing/pom.xml
 +++ b/processing/pom.xml
 @@ -36,7 +36,7 @@
diff --git a/druid/stackable/patches/30.0.0/0005-Include-jackson-dataformat-xml-dependency.patch b/druid/stackable/patches/33.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
similarity index 79%
rename from druid/stackable/patches/30.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
rename to druid/stackable/patches/33.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
index ac37f765a..593262f76 100644
--- a/druid/stackable/patches/30.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
+++ b/druid/stackable/patches/33.0.0/0005-Include-jackson-dataformat-xml-dependency.patch
@@ -1,4 +1,4 @@
-From 062c9f9bf3b27752bb4546e468e3b48befc893fe Mon Sep 17 00:00:00 2001
+From 3df406a5c0d69a24d3ae8e4ef372fab058bf5279 Mon Sep 17 00:00:00 2001
 From: Lars Francke <git@lars-francke.de>
 Date: Mon, 17 Feb 2025 16:42:49 +0100
 Subject: Include jackson-dataformat-xml dependency.
@@ -12,12 +12,12 @@ build.
  1 file changed, 5 insertions(+)
 
 diff --git a/server/pom.xml b/server/pom.xml
-index ec2f4dec4f..3861f18ed1 100644
+index 468a40d9f0..0ffcfd60b9 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/30.0.0/0006-Stop-building-the-tar.gz-distribution.patch b/druid/stackable/patches/33.0.0/0006-Stop-building-the-tar.gz-distribution.patch
similarity index 93%
rename from druid/stackable/patches/30.0.0/0006-Stop-building-the-tar.gz-distribution.patch
rename to druid/stackable/patches/33.0.0/0006-Stop-building-the-tar.gz-distribution.patch
index d5913d90f..418923c7e 100644
--- a/druid/stackable/patches/30.0.0/0006-Stop-building-the-tar.gz-distribution.patch
+++ b/druid/stackable/patches/33.0.0/0006-Stop-building-the-tar.gz-distribution.patch
@@ -1,4 +1,4 @@
-From c2a67767f6e06dcf7ea2bad4f7616cf69717b3b6 Mon Sep 17 00:00:00 2001
+From 88931513218f65a4f378fefb281cbf0dcc872563 Mon Sep 17 00:00:00 2001
 From: Lars Francke <git@lars-francke.de>
 Date: Mon, 17 Feb 2025 16:42:49 +0100
 Subject: Stop building the tar.gz distribution.
diff --git a/druid/stackable/patches/30.0.0/0007-Update-CycloneDX-plugin.patch b/druid/stackable/patches/33.0.0/0007-Update-CycloneDX-plugin.patch
similarity index 86%
rename from druid/stackable/patches/30.0.0/0007-Update-CycloneDX-plugin.patch
rename to druid/stackable/patches/33.0.0/0007-Update-CycloneDX-plugin.patch
index 6d94c190d..65922367a 100644
--- a/druid/stackable/patches/30.0.0/0007-Update-CycloneDX-plugin.patch
+++ b/druid/stackable/patches/33.0.0/0007-Update-CycloneDX-plugin.patch
@@ -1,4 +1,4 @@
-From eed0684b8097203e9d61c52093eb6dfe0960850d Mon Sep 17 00:00:00 2001
+From 9c3a542018886a2330a7d54ee9bf96cdda6095ac Mon Sep 17 00:00:00 2001
 From: Lukas Voetmand <lukas.voetmand@stackable.tech>
 Date: Fri, 6 Sep 2024 17:53:52 +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 38c6b8dbb5..de1a3bddc4 100644
+index 7a7cbea9de..1687b906f7 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1700,7 +1700,11 @@
+@@ -1776,7 +1776,11 @@
              <plugin>
                  <groupId>org.cyclonedx</groupId>
                  <artifactId>cyclonedx-maven-plugin</artifactId>
diff --git a/druid/stackable/patches/30.0.0/0008-Fix-CVE-2024-36114.patch b/druid/stackable/patches/33.0.0/0008-Fix-CVE-2024-36114.patch
similarity index 93%
rename from druid/stackable/patches/30.0.0/0008-Fix-CVE-2024-36114.patch
rename to druid/stackable/patches/33.0.0/0008-Fix-CVE-2024-36114.patch
index 59243a398..c75250b84 100644
--- a/druid/stackable/patches/30.0.0/0008-Fix-CVE-2024-36114.patch
+++ b/druid/stackable/patches/33.0.0/0008-Fix-CVE-2024-36114.patch
@@ -1,8 +1,9 @@
-From 0d9d6f564c52234c1eba4762c465a95f52cf8f0a Mon Sep 17 00:00:00 2001
+From a658272dda39b4bd26d55b70a01d67cd9db7bfcf Mon Sep 17 00:00:00 2001
 From: Malte Sander <malte.sander.it@gmail.com>
 Date: Thu, 12 Dec 2024 17:59:17 +0100
 Subject: Fix CVE-2024-36114
 
+Fix CVE-2024-36114
 see https://github.com/stackabletech/vulnerabilities/issues/834
 
 Aircompressor is a library with ports of the Snappy, LZO, LZ4, and
@@ -26,10 +27,10 @@ known workarounds for this issue.
  1 file changed, 6 insertions(+)
 
 diff --git a/pom.xml b/pom.xml
-index de1a3bddc4..7beda6238f 100644
+index 1687b906f7..7149b14cc0 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -255,6 +255,12 @@
+@@ -282,6 +282,12 @@
      </pluginRepositories>
      <dependencyManagement>
          <dependencies>
diff --git a/druid/stackable/patches/30.0.0/0009-Update-FMPP-version.patch b/druid/stackable/patches/33.0.0/0009-Update-FMPP-version.patch
similarity index 88%
rename from druid/stackable/patches/30.0.0/0009-Update-FMPP-version.patch
rename to druid/stackable/patches/33.0.0/0009-Update-FMPP-version.patch
index 98b0297c4..368392e75 100644
--- a/druid/stackable/patches/30.0.0/0009-Update-FMPP-version.patch
+++ b/druid/stackable/patches/33.0.0/0009-Update-FMPP-version.patch
@@ -1,4 +1,4 @@
-From f6634ac02aa2fab11811915283e92c7b9ae1af5e Mon Sep 17 00:00:00 2001
+From 2f29d7ec5588eea232f964f0601ce2039efbbb13 Mon Sep 17 00:00:00 2001
 From: Lars Francke <git@lars-francke.de>
 Date: Thu, 12 Dec 2024 06:35:21 +0100
 Subject: Update FMPP version
@@ -12,10 +12,10 @@ which we don't want.
  1 file changed, 7 insertions(+)
 
 diff --git a/sql/pom.xml b/sql/pom.xml
-index 6669d43e52..1d02e4ef58 100644
+index 2304c14e26..d78b06029a 100644
 --- a/sql/pom.xml
 +++ b/sql/pom.xml
-@@ -384,6 +384,13 @@
+@@ -361,6 +361,13 @@
        <plugin>
          <groupId>com.googlecode.fmpp-maven-plugin</groupId>
          <artifactId>fmpp-maven-plugin</artifactId>
diff --git a/druid/stackable/patches/30.0.0/0010-Fix-CVE-2023-34455.patch b/druid/stackable/patches/33.0.0/0010-Fix-CVE-2023-34455.patch
similarity index 94%
rename from druid/stackable/patches/30.0.0/0010-Fix-CVE-2023-34455.patch
rename to druid/stackable/patches/33.0.0/0010-Fix-CVE-2023-34455.patch
index b681c5649..8d6b57ebb 100644
--- a/druid/stackable/patches/30.0.0/0010-Fix-CVE-2023-34455.patch
+++ b/druid/stackable/patches/33.0.0/0010-Fix-CVE-2023-34455.patch
@@ -1,4 +1,4 @@
-From 4832e1270c2f541ad3724455034cbec394ba6263 Mon Sep 17 00:00:00 2001
+From cd10ee4dc6abb7131f28dbf6e8aceed4af2bc7f8 Mon Sep 17 00:00:00 2001
 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
 Date: Tue, 28 Jan 2025 17:29:59 +0100
 Subject: Fix CVE-2023-34455
@@ -17,10 +17,10 @@ This patch removes the vulnerable jars.
  1 file changed, 14 insertions(+)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index d5918710ef..2d5bfc6ab4 100644
+index c8b7e13054..f93af34434 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -259,6 +259,20 @@
+@@ -261,6 +261,20 @@
                                      </arguments>
                                  </configuration>
                              </execution>
diff --git a/druid/stackable/patches/33.0.0/patchable.toml b/druid/stackable/patches/33.0.0/patchable.toml
new file mode 100644
index 000000000..306013364
--- /dev/null
+++ b/druid/stackable/patches/33.0.0/patchable.toml
@@ -0,0 +1,2 @@
+upstream = "https://github.com/apache/druid.git"
+base = "84b59b984b69ebc34e0c971ad207b69384941c0b"
diff --git a/druid/versions.py b/druid/versions.py
index ec46b26da..bdf89d0d3 100644
--- a/druid/versions.py
+++ b/druid/versions.py
@@ -1,21 +1,21 @@
 versions = [
     {
-        "product": "30.0.0",
-        # https://druid.apache.org/docs/30.0.0/operations/java/
+        "product": "30.0.1",
+        # https://druid.apache.org/docs/30.0.1/operations/java/
         "java-base": "17",
         "java-devel": "17",
         "authorizer": "0.6.0",
     },
     {
-        "product": "30.0.1",
-        # https://druid.apache.org/docs/30.0.1/operations/java/
+        "product": "31.0.1",
+        # https://druid.apache.org/docs/31.0.1/operations/java/
         "java-base": "17",
         "java-devel": "17",
         "authorizer": "0.6.0",
     },
     {
-        "product": "31.0.1",
-        # https://druid.apache.org/docs/31.0.1/operations/java/
+        "product": "33.0.0",
+        # https://druid.apache.org/docs/33.0.0/operations/java/
         "java-base": "17",
         "java-devel": "17",
         "authorizer": "0.6.0",