diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f0d5068..87a12d4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file.
 
 - Default to OCI for image metadata and product image selection ([#561]).
 - Increase default memory reservation to `768Mi` to avoid `OOMKilled` ([#578]).
-- Deprecated version `4.0.0` ([#579]).
+- Mark version `4.0.1` as experimental and set `4.0.0` as LTS ([#582]).
 
 ### Fixed
 
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
 [#574]: https://github.com/stackabletech/hive-operator/pull/574
 [#578]: https://github.com/stackabletech/hive-operator/pull/578
 [#579]: https://github.com/stackabletech/hive-operator/pull/579
+[#582]: https://github.com/stackabletech/hive-operator/pull/582
 
 ## [24.11.1] - 2025-01-10
 
diff --git a/docs/modules/hive/partials/supported-versions.adoc b/docs/modules/hive/partials/supported-versions.adoc
index 6e4031bc..4b5c91dd 100644
--- a/docs/modules/hive/partials/supported-versions.adoc
+++ b/docs/modules/hive/partials/supported-versions.adoc
@@ -2,5 +2,6 @@
 // This is a separate file, since it is used by both the direct Hive-Operator documentation, and the overarching
 // Stackable Platform documentation.
 
-- 4.0.1 (LTS)
+- 4.0.1 (experimental) - Spark Iceberg jobs may fail as described https://github.com/stackabletech/spark-k8s-operator/issues/537[here]
+- 4.0.0 (LTS)
 - 3.1.3 (deprecated)
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 4b17bf3f..ae1b406a 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -17,6 +17,7 @@ dimensions:
   - name: hive
     values:
       - 3.1.3
+      - 4.0.0
       - 4.0.1
       # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
       # as in the example below.