diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b6cdc5..b1e611f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,10 +10,12 @@ All notable changes to this project will be documented in this file.
  config property `requestedSecretLifetime`. This helps reducing frequent Pod restarts ([#660]).
 - Run a `containerdebug` process in the background of each "druid" container to collect debugging information ([#667]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#677]).
+- Support Apache Druid `31.0.1` as experimental version and adjust coordinator memory limit ([#685]).
 
 [#660]: https://github.com/stackabletech/druid-operator/pull/660
 [#667]: https://github.com/stackabletech/druid-operator/pull/667
 [#677]: https://github.com/stackabletech/druid-operator/pull/677
+[#685]: https://github.com/stackabletech/druid-operator/pull/685
 
 ## [24.11.1] - 2025-01-09
 
diff --git a/docs/modules/druid/examples/getting_started/druid.yaml b/docs/modules/druid/examples/getting_started/druid.yaml
index f01d56f3..c16c7268 100644
--- a/docs/modules/druid/examples/getting_started/druid.yaml
+++ b/docs/modules/druid/examples/getting_started/druid.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-druid
 spec:
   image:
-    productVersion: 30.0.0
+    productVersion: 31.0.1
   clusterConfig:
     listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
     zookeeperConfigMapName: simple-druid-znode
diff --git a/docs/modules/druid/examples/getting_started/druid.yaml.j2 b/docs/modules/druid/examples/getting_started/druid.yaml.j2
index f01d56f3..c16c7268 100644
--- a/docs/modules/druid/examples/getting_started/druid.yaml.j2
+++ b/docs/modules/druid/examples/getting_started/druid.yaml.j2
@@ -5,7 +5,7 @@ metadata:
   name: simple-druid
 spec:
   image:
-    productVersion: 30.0.0
+    productVersion: 31.0.1
   clusterConfig:
     listenerClass: external-stable # This exposes your Stacklet outside of Kubernetes. Remove this configuration if this is not desired
     zookeeperConfigMapName: simple-druid-znode
diff --git a/docs/modules/druid/partials/supported-versions.adoc b/docs/modules/druid/partials/supported-versions.adoc
index 46add761..4f18bc92 100644
--- a/docs/modules/druid/partials/supported-versions.adoc
+++ b/docs/modules/druid/partials/supported-versions.adoc
@@ -2,5 +2,6 @@
 // This is a separate file, since it is used by both the direct Druid documentation, and the overarching
 // Stackable Platform documentation.
 
+- 31.0.1 (experimental)
 - 30.0.0 (LTS)
 - 26.0.0 (deprecated)
diff --git a/examples/psql-s3/psql-s3-druid-cluster.yaml b/examples/psql-s3/psql-s3-druid-cluster.yaml
index 49a6cf7c..a8de8534 100644
--- a/examples/psql-s3/psql-s3-druid-cluster.yaml
+++ b/examples/psql-s3/psql-s3-druid-cluster.yaml
@@ -45,7 +45,7 @@ metadata:
   name: psql-s3-druid
 spec:
   image:
-    productVersion: 30.0.0
+    productVersion: 31.0.1
   clusterConfig:
     deepStorage:
       s3:
diff --git a/examples/psql/psql-hdfs-druid-cluster.yaml b/examples/psql/psql-hdfs-druid-cluster.yaml
index 505dc94f..a5637f4c 100644
--- a/examples/psql/psql-hdfs-druid-cluster.yaml
+++ b/examples/psql/psql-hdfs-druid-cluster.yaml
@@ -56,7 +56,7 @@ metadata:
   name: psql-druid
 spec:
   image:
-    productVersion: 30.0.0
+    productVersion: 31.0.1
   clusterConfig:
     deepStorage:
       hdfs:
diff --git a/examples/tls/tls-druid-cluster.yaml b/examples/tls/tls-druid-cluster.yaml
index bec8b443..d2c97d70 100644
--- a/examples/tls/tls-druid-cluster.yaml
+++ b/examples/tls/tls-druid-cluster.yaml
@@ -78,7 +78,7 @@ metadata:
   name: derby-druid
 spec:
   image:
-    productVersion: 30.0.0
+    productVersion: 31.0.1
   clusterConfig:
     authentication:
       - authenticationClass: druid-mtls-authentication-class
diff --git a/rust/crd/src/resource.rs b/rust/crd/src/resource.rs
index f122a566..a810abc7 100644
--- a/rust/crd/src/resource.rs
+++ b/rust/crd/src/resource.rs
@@ -178,7 +178,7 @@ pub static MIDDLE_MANAGER_RESOURCES: LazyLock<
         max: Some(Quantity("1200m".to_owned())),
     },
     memory: MemoryLimitsFragment {
-        limit: Some(Quantity("1Gi".to_owned())),
+        limit: Some(Quantity("1500Mi".to_owned())),
         runtime_limits: NoRuntimeLimitsFragment {},
     },
     storage: storage::DruidStorageFragment {},
@@ -221,7 +221,7 @@ pub static COORDINATOR_RESOURCES: LazyLock<
         max: Some(Quantity("400m".to_owned())),
     },
     memory: MemoryLimitsFragment {
-        limit: Some(Quantity("512Mi".to_owned())),
+        limit: Some(Quantity("768Mi".to_owned())),
         runtime_limits: NoRuntimeLimitsFragment {},
     },
     storage: storage::DruidStorageFragment {},
diff --git a/tests/templates/kuttl/authorizer/02-install-opa.yaml.j2 b/tests/templates/kuttl/authorizer/02-install-opa.yaml.j2
index 2f1cdaf4..2425de4e 100644
--- a/tests/templates/kuttl/authorizer/02-install-opa.yaml.j2
+++ b/tests/templates/kuttl/authorizer/02-install-opa.yaml.j2
@@ -11,15 +11,15 @@ data:
 
     default allow = false
 
-    allow {
+    allow if {
       input.user == "alice"
     }
 
-    allow {
+    allow if {
       input.user == "admin"
     }
 
-    allow {
+    allow if {
       input.user == "druid_system"
     }
 ---
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index a31c7e6f..e8d2618f 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -15,11 +15,12 @@ dimensions:
     values:
       - 26.0.0
       - 30.0.0
+      - 31.0.1
       # To use a custom image, add a comma and the full name after the product version
       # - 28.0.1,docker.stackable.tech/sandbox/druid:28.0.1-stackable0.0.0-dev
   - name: druid-latest
     values:
-      - 30.0.0
+      - 31.0.1
       # To use a custom image, add a comma and the full name after the product version
       # - 28.0.1,docker.stackable.tech/sandbox/druid:28.0.1-stackable0.0.0-dev
   - name: zookeeper
@@ -30,7 +31,7 @@ dimensions:
       - 3.9.2
   - name: opa
     values:
-      - 0.66.0
+      - 1.0.0
   - name: hadoop
     values:
       - 3.4.0