diff --git a/docs/modules/trino/examples/usage-guide/trino-insecure.yaml b/docs/modules/trino/examples/usage-guide/trino-insecure.yaml
index 5f26916f..d6e79ab9 100644
--- a/docs/modules/trino/examples/usage-guide/trino-insecure.yaml
+++ b/docs/modules/trino/examples/usage-guide/trino-insecure.yaml
@@ -37,7 +37,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
diff --git a/docs/modules/trino/examples/usage-guide/trino-secure-internal-tls.yaml b/docs/modules/trino/examples/usage-guide/trino-secure-internal-tls.yaml
index c986bbd1..9ba7e35c 100644
--- a/docs/modules/trino/examples/usage-guide/trino-secure-internal-tls.yaml
+++ b/docs/modules/trino/examples/usage-guide/trino-secure-internal-tls.yaml
@@ -72,7 +72,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
diff --git a/docs/modules/trino/examples/usage-guide/trino-secure-tls-only.yaml b/docs/modules/trino/examples/usage-guide/trino-secure-tls-only.yaml
index 6e6ea91c..92f587f9 100644
--- a/docs/modules/trino/examples/usage-guide/trino-secure-tls-only.yaml
+++ b/docs/modules/trino/examples/usage-guide/trino-secure-tls-only.yaml
@@ -52,7 +52,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
diff --git a/docs/modules/trino/examples/usage-guide/trino-secure-tls.yaml b/docs/modules/trino/examples/usage-guide/trino-secure-tls.yaml
index 61eda5e3..a10f857d 100644
--- a/docs/modules/trino/examples/usage-guide/trino-secure-tls.yaml
+++ b/docs/modules/trino/examples/usage-guide/trino-secure-tls.yaml
@@ -72,7 +72,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
diff --git a/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml b/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml
index 55822688..a741763e 100644
--- a/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml
+++ b/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml
@@ -136,7 +136,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
diff --git a/examples/simple-trino-cluster-hive-ha-s3.yaml b/examples/simple-trino-cluster-hive-ha-s3.yaml
index b94dc05b..91cc96ed 100644
--- a/examples/simple-trino-cluster-hive-ha-s3.yaml
+++ b/examples/simple-trino-cluster-hive-ha-s3.yaml
@@ -43,7 +43,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:postgresql://hive-postgresql:5432/hive
diff --git a/examples/simple-trino-cluster-s3.yaml b/examples/simple-trino-cluster-s3.yaml
index 9f5b5440..cecfd4cb 100644
--- a/examples/simple-trino-cluster-s3.yaml
+++ b/examples/simple-trino-cluster-s3.yaml
@@ -50,7 +50,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
diff --git a/examples/simple-trino-cluster.yaml b/examples/simple-trino-cluster.yaml
index cc90b92c..a5bc5b30 100644
--- a/examples/simple-trino-cluster.yaml
+++ b/examples/simple-trino-cluster.yaml
@@ -46,7 +46,7 @@ metadata:
   name: simple-hive-derby
 spec:
   image:
-    productVersion: 3.1.3
+    productVersion: 4.0.0
   clusterConfig:
     database:
       connString: jdbc:derby:;databaseName=/tmp/metastore_db;create=true
diff --git a/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2 b/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2
index 72dbbf23..4563414b 100644
--- a/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2
+++ b/tests/templates/kuttl/opa-authorization/03-install-hive.yaml.j2
@@ -5,7 +5,7 @@ metadata:
   name: hive
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['hive'] }}"
+    productVersion: "{{ test_scenario['values']['hive-latest'] }}"
     pullPolicy: IfNotPresent
   clusterConfig:
     database:
diff --git a/tests/templates/kuttl/smoke/04-prepare-bucket.yaml.j2 b/tests/templates/kuttl/smoke/04-prepare-bucket.yaml.j2
index 6f46c194..7ed22298 100644
--- a/tests/templates/kuttl/smoke/04-prepare-bucket.yaml.j2
+++ b/tests/templates/kuttl/smoke/04-prepare-bucket.yaml.j2
@@ -7,4 +7,4 @@ commands:
   - script: |
       POD=$(kubectl -n $NAMESPACE get pod -l app.kubernetes.io/instance=minio -o name | head -n 1 | sed -e 's#pod/##')
       kubectl cp -n $NAMESPACE yellow_tripdata_2021-07.csv $POD:/tmp
-      kubectl -n $NAMESPACE exec $POD -- mc cp /tmp/yellow_tripdata_2021-07.csv local/trino
+      kubectl -n $NAMESPACE exec $POD -- mc cp /tmp/yellow_tripdata_2021-07.csv local/trino/taxi-data/
diff --git a/tests/templates/kuttl/smoke/check-s3.py b/tests/templates/kuttl/smoke/check-s3.py
index c1e96b4c..cd33e33e 100755
--- a/tests/templates/kuttl/smoke/check-s3.py
+++ b/tests/templates/kuttl/smoke/check-s3.py
@@ -65,7 +65,7 @@ def run_query(connection, query):
     trip_distance VARCHAR,
     ratecode_id VARCHAR
 ) WITH (
-    external_location = 's3a://trino/',
+    external_location = 's3a://trino/taxi-data/',
     format = 'csv',
     skip_header_line_count = 1
 )
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 8632f24f..d0434309 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -21,6 +21,10 @@ dimensions:
   - name: hive
     values:
       - 3.1.3
+      - 4.0.0
+  - name: hive-latest
+    values:
+      - 4.0.0
   - name: opa
     values:
       - 0.66.0
@@ -97,7 +101,7 @@ tests:
   - name: opa-authorization
     dimensions:
       - trino-latest
-      - hive
+      - hive-latest
       - opa
       - keycloak
       - openshift