diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc
index 4b80fee5..c68a18df 100644
--- a/docs/modules/nifi/partials/supported-versions.adoc
+++ b/docs/modules/nifi/partials/supported-versions.adoc
@@ -3,9 +3,8 @@
 // Stackable Platform documentation.
 
 * 2.9.0
-* 2.7.2
+* 2.7.2 (Deprecated)
 ** Please note that NiFi starting with 2.7.2 supports Iceberg, but only with S3 and Iceberg REST catalog (no Hive metastore or HDFS support). Please read on xref:nifi:usage_guide/writing-to-iceberg-tables.adoc[] for details.
 * 2.6.0 (LTS)
-* 1.28.1 (Deprecated)
 
 For details on how to upgrade your NiFi version, refer to xref:nifi:usage_guide/updating.adoc[].
diff --git a/tests/templates/kuttl/custom-components-git-sync/30_install-nifi.yaml.j2 b/tests/templates/kuttl/custom-components-git-sync/30_install-nifi.yaml.j2
index 0e716577..b1f43454 100644
--- a/tests/templates/kuttl/custom-components-git-sync/30_install-nifi.yaml.j2
+++ b/tests/templates/kuttl/custom-components-git-sync/30_install-nifi.yaml.j2
@@ -148,7 +148,7 @@ data:
           "bundle": {
             "group": "org.apache.nifi",
             "artifact": "nifi-prometheus-nar",
-            "version": "1.28.1"
+            "version": "2.9.0"
           },
           "properties": {
             "prometheus-reporting-task-metrics-endpoint-port": "8081",
@@ -190,7 +190,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-standard-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "Regular Expression": "(?s)(^.*$)",
@@ -235,7 +235,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-standard-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "HTTP Context Map": "fd3b17c4-0196-1000-0000-000076ed786c",
@@ -311,7 +311,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-standard-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "multipart-request-max-size": "1 MB",
@@ -475,7 +475,7 @@ data:
             "bundle": {
               "group": "org.apache.nifi",
               "artifact": "nifi-http-context-map-nar",
-              "version": "1.28.1"
+              "version": "2.9.0"
             },
             "properties": {
               "Request Expiration": "1 min",
@@ -488,7 +488,7 @@ data:
                 "bundle": {
                   "group": "org.apache.nifi",
                   "artifact": "nifi-standard-services-api-nar",
-                  "version": "1.28.1"
+                  "version": "2.9.0"
                 }
               }
             ],
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 38e1b6ec..637422db 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -2,19 +2,12 @@
 dimensions:
   - name: nifi
     values:
-      - 1.28.1
       - 2.6.0
       - 2.7.2
       - 2.9.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.6.0,oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
-  - name: nifi_old
-    values:
-      - 1.28.1
-  - name: nifi_new
-    values:
-      - 2.9.0
   - name: nifi-latest
     values:
       - 2.9.0
@@ -27,16 +20,6 @@ dimensions:
     values:
       - 2.7.2
       - 2.9.0
-    # TODO: Can be removed once NiFi 1.x.x is removed - only for separate smoke tests
-  - name: nifi-v1
-    values:
-      - 1.28.1
-    # TODO: Can be removed once NiFi 1.x.x is removed - only for separate smoke tests
-  - name: nifi-v2
-    values:
-      - 2.6.0
-      - 2.7.2
-      - 2.9.0
     # Use Kubernetes manager if set to false
   - name: use-zookeeper-manager
     values:
@@ -90,8 +73,7 @@ dimensions:
 tests:
   - name: upgrade
     dimensions:
-      - nifi_old
-      - nifi_new
+      - nifi
       - zookeeper-latest
       - openshift
   - name: orphaned_resources
@@ -99,17 +81,9 @@ tests:
       - nifi
       - zookeeper-latest
       - openshift
-  # TODO: Can be removed once NiFi 1.x.x is removed - only for separate smoke tests
-  - name: smoke_v1
+  - name: smoke
     dimensions:
-      - nifi-v1
-      - zookeeper
-      - listener-class
-      - openshift
-  # TODO: Can be renamed to smoke once NiFi 1.x.x is removed - only for separate smoke tests
-  - name: smoke_v2
-    dimensions:
-      - nifi-v2
+      - nifi
       - zookeeper
       - use-zookeeper-manager
       - listener-class
@@ -136,7 +110,7 @@ tests:
       - openshift
   - name: cluster-sync-cs-bug
     dimensions:
-      - nifi-v2
+      - nifi
       - openshift
   - name: oidc-opa
     dimensions: