diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc
index f9d44aed..ac5437d5 100644
--- a/docs/modules/nifi/partials/supported-versions.adoc
+++ b/docs/modules/nifi/partials/supported-versions.adoc
@@ -2,8 +2,9 @@
 // This is a separate file, since it is used by both the direct NiFi-Operator documentation, and the overarching
 // Stackable Platform documentation.
 
-* 2.4.0 (Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!)
-* 1.28.1
-* 1.27.0 (LTS)
+* 2.6.0 (LTS, Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!)
+* 2.4.0 (Deprecated, Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!)
+* 1.28.1 (Deprecated)
+* 1.27.0 (Deprecated)
 
 For details on how to upgrade your NiFi version, refer to xref:nifi:usage_guide/updating.adoc[].
diff --git a/tests/templates/kuttl/iceberg/34_trino.yaml.j2 b/tests/templates/kuttl/iceberg/34_trino.yaml.j2
index 9d8b5415..6c7b1992 100644
--- a/tests/templates/kuttl/iceberg/34_trino.yaml.j2
+++ b/tests/templates/kuttl/iceberg/34_trino.yaml.j2
@@ -61,7 +61,7 @@ spec:
         replicas: 1
   workers:
     config:
-      gracefulShutdownTimeout: 60s # Let the test run faster
+      gracefulShutdownTimeout: 120s # Let the test run faster, but allow for slow queries
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
 {% if test_scenario['values']['iceberg-use-kerberos'] == 'true' %}
diff --git a/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2 b/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2
index 7958931a..2f3d28ad 100644
--- a/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2
+++ b/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2
@@ -15,7 +15,7 @@ spec:
             - pipefail
             - -c
             - |
-              cat << 'EOF' | java -jar trino-cli-*-executable.jar --server https://trino-coordinator:8443 --insecure --user admin
+              cat << 'EOF' | ./trino-cli --server https://trino-coordinator:8443 --insecure --user admin
               CREATE SCHEMA IF NOT EXISTS iceberg.s3 WITH (location = 's3a://demo/lakehouse/s3');
               CREATE TABLE IF NOT EXISTS iceberg.s3.greetings (hello varchar);
               CREATE SCHEMA IF NOT EXISTS iceberg.hdfs WITH (location = 'hdfs:/lakehouse/hdfs');
diff --git a/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2 b/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2
index 079a2722..c4ce0cb1 100644
--- a/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2
+++ b/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2
@@ -16,7 +16,7 @@ spec:
             - -c
             - |
               for SCHEMA in iceberg.s3 iceberg.hdfs; do
-                COUNT=$(cat << EOF | java -jar trino-cli-*-executable.jar --server https://trino-coordinator:8443 --insecure --user admin
+                COUNT=$(cat << EOF | ./trino-cli --server https://trino-coordinator:8443 --insecure --user admin
                 SELECT COUNT(*) FROM $SCHEMA.greetings WHERE hello = 'world from NiFi :)';
               EOF
                 )
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 83984350..c18a2196 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -5,23 +5,24 @@ dimensions:
       - 1.27.0
       - 1.28.1
       - 2.4.0
+      - 2.6.0
       # 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.
-      # - 2.4.0,oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
+      # - 2.6.0,oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
   - name: nifi_old
     values:
       - 1.27.0
   - name: nifi_new
     values:
-      - 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
+      - 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
   - name: nifi-latest
     values:
-      - 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
+      - 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
   - name: nifi-iceberg
     # Not all NiFi versions support Iceberg with the same functionality!
     # E.g. our own implementation started with NiFi 2.2.0
     values:
-      - 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
+      - 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
     # TODO: Can be removed once NiFi 1.x.x is removed - only for seperate smoke tests
   - name: nifi-v1
     values:
@@ -31,6 +32,7 @@ dimensions:
   - name: nifi-v2
     values:
       - 2.4.0
+      - 2.6.0
     # Use Kubernetes manager if set to false
   - name: use-zookeeper-manager
     values: