diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c9f3903..a029a33 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [17, 21, 25]
+        version: [21, 25]
     steps:
       - uses: actions/checkout@v5
 
diff --git a/Containerfile b/Containerfile
index fae760d..4d525df 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/openjdk-17:1.22
+FROM registry.access.redhat.com/ubi9/openjdk-21:latest
 
 LABEL org.opencontainers.image.source='https://github.com/streamshub/streams-e2e'
 
diff --git a/README.md b/README.md
index f5743bf..5288bc4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Test suite for verify interoperability of streams components like kafka, flink,
 
 ## Requirements
 There is several requirements you have to have installed to properly build the project and run the tests:
-- Java 17+
+- Java 21+
 - Helm 3+
 - OperatorSDK
 
diff --git a/docs/io/streams/e2e/flink/sql/SqlExampleST.md b/docs/io/streams/e2e/flink/sql/SqlExampleST.md
index ffef6ef..4b614cc 100644
--- a/docs/io/streams/e2e/flink/sql/SqlExampleST.md
+++ b/docs/io/streams/e2e/flink/sql/SqlExampleST.md
@@ -2,7 +2,7 @@
 
 **Description:** This test suite verifies that flink-sql-example works correctly
 
-**Before tests execution steps:**
+**Before test execution steps:**
 
 | Step | Action | Result |
 | - | - | - |
diff --git a/docs/io/streams/e2e/flink/sql/SqlJobRunnerST.md b/docs/io/streams/e2e/flink/sql/SqlJobRunnerST.md
index e01f790..dddf80c 100644
--- a/docs/io/streams/e2e/flink/sql/SqlJobRunnerST.md
+++ b/docs/io/streams/e2e/flink/sql/SqlJobRunnerST.md
@@ -2,7 +2,7 @@
 
 **Description:** This test suite verifies that flink-sql-example works correctly
 
-**Before tests execution steps:**
+**Before test execution steps:**
 
 | Step | Action | Result |
 | - | - | - |
diff --git a/docs/io/streams/e2e/flink/sql/SqlSecurityST.md b/docs/io/streams/e2e/flink/sql/SqlSecurityST.md
index 7de84dd..bf95dad 100644
--- a/docs/io/streams/e2e/flink/sql/SqlSecurityST.md
+++ b/docs/io/streams/e2e/flink/sql/SqlSecurityST.md
@@ -2,7 +2,7 @@
 
 **Description:** This test suite verifies that flink-sql can uses security kafka connection
 
-**Before tests execution steps:**
+**Before test execution steps:**
 
 | Step | Action | Result |
 | - | - | - |
diff --git a/pom.xml b/pom.xml
index 619b749..a069ef7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,13 @@
     </issueManagement>
 
     <properties>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <test-frame.version>1.2.0</test-frame.version>
+        <kubetest4j.version>1.0.0</kubetest4j.version>
         <skodjob-doc.version>0.6.0</skodjob-doc.version>
-        <fabric8.version>7.4.0</fabric8.version>
-        <log4j.version>2.25.2</log4j.version>
+        <fabric8.version>7.6.1</fabric8.version>
+        <log4j.version>2.25.3</log4j.version>
         <slf4j.version>2.0.17</slf4j.version>
         <jackson.version>2.17.2</jackson.version>
 
@@ -57,14 +57,14 @@
         <debezium.operator.files.destination>debezium</debezium.operator.files.destination>
         <keycloak.operator.files.destination>keycloak</keycloak.operator.files.destination>
         <!-- Operators versions -->
-        <strimzi.version>0.48.0</strimzi.version>
+        <strimzi.version>0.51.0</strimzi.version>
         <flink.version>1.12.1</flink.version>
         <cert.manager.version>1.18.2</cert.manager.version>
         <apicurio.registry.version>1.1.3-v2.6.4.final</apicurio.registry.version>
         <apicurio.api.version>1.1.2</apicurio.api.version>
         <apicurio.lib.version>2.6.13.Final</apicurio.lib.version>
         <debezium.operator.version>3.1.1</debezium.operator.version>
-        <kafka.version>4.0.0</kafka.version>
+        <kafka.version>4.2.0</kafka.version>
         <keycloak.version>26.3.3</keycloak.version>
     </properties>
 
@@ -94,25 +94,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-common</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>kubetest4j</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-kubernetes</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>kubernetes-resources</artifactId>
+            <version>${kubetest4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-openshift</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>openshift-resources</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-log-collector</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>log-collector</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
             <groupId>io.skodjob</groupId>
@@ -121,9 +121,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-metrics-collector</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>metrics-collector</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
@@ -411,7 +411,7 @@
                                 <ignoredUnusedDeclaredDependency>io.sundr:builder-annotations</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.projectlombok:lombok</ignoredUnusedDeclaredDependency>
                                 <!-- Temporary exclusion as it will be needed when we start write something -->
-                                <ignoredUnusedDeclaredDependency>io.skodjob:test-frame-metrics-collector</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>io.skodjob.kubetest4j:metrics-collector</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>io.fabric8:openshift-client</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>io.fabric8:kubernetes-model</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>
diff --git a/src/main/java/io/streams/Environment.java b/src/main/java/io/streams/Environment.java
index 728bad3..98ddffa 100644
--- a/src/main/java/io/streams/Environment.java
+++ b/src/main/java/io/streams/Environment.java
@@ -4,7 +4,7 @@
  */
 package io.streams;
 
-import io.skodjob.testframe.environment.TestEnvironmentVariables;
+import io.skodjob.kubetest4j.environment.TestEnvironmentVariables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/streams/listeners/MustGatherImpl.java b/src/main/java/io/streams/listeners/MustGatherImpl.java
index 57c2060..7515db0 100644
--- a/src/main/java/io/streams/listeners/MustGatherImpl.java
+++ b/src/main/java/io/streams/listeners/MustGatherImpl.java
@@ -5,10 +5,10 @@
 package io.streams.listeners;
 
 import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
-import io.skodjob.testframe.LogCollector;
-import io.skodjob.testframe.LogCollectorBuilder;
-import io.skodjob.testframe.interfaces.MustGatherSupplier;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.LogCollector;
+import io.skodjob.kubetest4j.LogCollectorBuilder;
+import io.skodjob.kubetest4j.interfaces.MustGatherSupplier;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.streams.Environment;
 import io.streams.constants.KubeResourceConstants;
 import io.streams.constants.TestConstants;
diff --git a/src/main/java/io/streams/operands/apicurio/resources/ApicurioRegistryType.java b/src/main/java/io/streams/operands/apicurio/resources/ApicurioRegistryType.java
index aa7458f..3c46bf8 100644
--- a/src/main/java/io/streams/operands/apicurio/resources/ApicurioRegistryType.java
+++ b/src/main/java/io/streams/operands/apicurio/resources/ApicurioRegistryType.java
@@ -9,8 +9,8 @@
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/streams/operands/certmanager/templates/CertManagerCaTemplate.java b/src/main/java/io/streams/operands/certmanager/templates/CertManagerCaTemplate.java
index 8101806..0f1879b 100644
--- a/src/main/java/io/streams/operands/certmanager/templates/CertManagerCaTemplate.java
+++ b/src/main/java/io/streams/operands/certmanager/templates/CertManagerCaTemplate.java
@@ -5,7 +5,7 @@
 package io.streams.operands.certmanager.templates;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/io/streams/operands/flink/resoruces/FlinkDeploymentType.java b/src/main/java/io/streams/operands/flink/resoruces/FlinkDeploymentType.java
index ec064e6..cd43e9a 100644
--- a/src/main/java/io/streams/operands/flink/resoruces/FlinkDeploymentType.java
+++ b/src/main/java/io/streams/operands/flink/resoruces/FlinkDeploymentType.java
@@ -7,8 +7,8 @@
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import org.apache.flink.v1beta1.FlinkDeployment;
 import org.apache.flink.v1beta1.FlinkDeploymentStatus;
 import org.slf4j.Logger;
diff --git a/src/main/java/io/streams/operands/flink/templates/FlinkDeploymentTemplate.java b/src/main/java/io/streams/operands/flink/templates/FlinkDeploymentTemplate.java
index bc5e833..bfbfbc9 100644
--- a/src/main/java/io/streams/operands/flink/templates/FlinkDeploymentTemplate.java
+++ b/src/main/java/io/streams/operands/flink/templates/FlinkDeploymentTemplate.java
@@ -6,7 +6,7 @@
 
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
 import io.fabric8.kubernetes.api.model.Quantity;
-import io.skodjob.testframe.utils.KubeUtils;
+import io.skodjob.kubetest4j.utils.KubeUtils;
 import io.streams.Environment;
 import org.apache.flink.v1beta1.FlinkDeploymentBuilder;
 import org.apache.flink.v1beta1.FlinkDeploymentSpec;
diff --git a/src/main/java/io/streams/operands/keycloak/templates/KeycloakDeploymentTemplate.java b/src/main/java/io/streams/operands/keycloak/templates/KeycloakDeploymentTemplate.java
index 0470583..66d621e 100644
--- a/src/main/java/io/streams/operands/keycloak/templates/KeycloakDeploymentTemplate.java
+++ b/src/main/java/io/streams/operands/keycloak/templates/KeycloakDeploymentTemplate.java
@@ -5,7 +5,7 @@
 package io.streams.operands.keycloak.templates;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/main/java/io/streams/operands/minio/MinioInstaller.java b/src/main/java/io/streams/operands/minio/MinioInstaller.java
index b4cbd43..24f6908 100644
--- a/src/main/java/io/streams/operands/minio/MinioInstaller.java
+++ b/src/main/java/io/streams/operands/minio/MinioInstaller.java
@@ -14,7 +14,7 @@
 import io.fabric8.kubernetes.api.model.VolumeMountBuilder;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.streams.constants.TestConstants;
 import java.util.Map;
 
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaBridgeType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaBridgeType.java
index c5a9b76..e89af86 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaBridgeType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaBridgeType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.bridge.KafkaBridge;
 import io.strimzi.api.kafka.model.bridge.KafkaBridgeList;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectType.java
index b73aea6..f85aaec 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.connect.KafkaConnect;
 import io.strimzi.api.kafka.model.connect.KafkaConnectList;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectorType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectorType.java
index db6a621..2969112 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectorType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaConnectorType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.connector.KafkaConnector;
 import io.strimzi.api.kafka.model.connector.KafkaConnectorList;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaMirrorMaker2Type.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaMirrorMaker2Type.java
index e10f666..45aae44 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaMirrorMaker2Type.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaMirrorMaker2Type.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2;
 import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2List;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaNodePoolType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaNodePoolType.java
index 92a991d..e9f4017 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaNodePoolType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaNodePoolType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.nodepool.KafkaNodePool;
 import io.strimzi.api.kafka.model.nodepool.KafkaNodePoolList;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaRebalanceType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaRebalanceType.java
index ad1f447..4f1a9f2 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaRebalanceType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaRebalanceType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.rebalance.KafkaRebalance;
 import io.strimzi.api.kafka.model.rebalance.KafkaRebalanceList;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaTopicType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaTopicType.java
index 7029a1a..408bf15 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaTopicType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaTopicType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.topic.KafkaTopic;
 import io.strimzi.api.kafka.model.topic.KafkaTopicList;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaType.java
index ae1feee..d6b9c9c 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.kafka.Kafka;
 import io.strimzi.api.kafka.model.kafka.KafkaList;
diff --git a/src/main/java/io/streams/operands/strimzi/resources/KafkaUserType.java b/src/main/java/io/streams/operands/strimzi/resources/KafkaUserType.java
index b814c11..d37b4ee 100644
--- a/src/main/java/io/streams/operands/strimzi/resources/KafkaUserType.java
+++ b/src/main/java/io/streams/operands/strimzi/resources/KafkaUserType.java
@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.user.KafkaUser;
 import io.strimzi.api.kafka.model.user.KafkaUserList;
diff --git a/src/main/java/io/streams/operands/strimzi/templates/KafkaTemplate.java b/src/main/java/io/streams/operands/strimzi/templates/KafkaTemplate.java
index b109bc2..18b4af1 100644
--- a/src/main/java/io/streams/operands/strimzi/templates/KafkaTemplate.java
+++ b/src/main/java/io/streams/operands/strimzi/templates/KafkaTemplate.java
@@ -4,7 +4,6 @@
  */
 package io.streams.operands.strimzi.templates;
 
-import io.strimzi.api.ResourceAnnotations;
 import io.strimzi.api.kafka.model.kafka.KafkaBuilder;
 import io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerBuilder;
 import io.strimzi.api.kafka.model.kafka.listener.KafkaListenerType;
@@ -15,8 +14,6 @@ public static KafkaBuilder defaultKafka(String namespace, String name) {
         return new KafkaBuilder()
             .withNewMetadata()
             .withNamespace(namespace)
-            .addToAnnotations(ResourceAnnotations.ANNO_STRIMZI_IO_NODE_POOLS, "enabled")
-            .addToAnnotations(ResourceAnnotations.ANNO_STRIMZI_IO_KRAFT, "enabled")
             .withName(name)
             .endMetadata()
             .withNewSpec()
diff --git a/src/main/java/io/streams/operators/manifests/ApicurioRegistryManifestInstaller.java b/src/main/java/io/streams/operators/manifests/ApicurioRegistryManifestInstaller.java
index b9caa7f..0bde6d3 100644
--- a/src/main/java/io/streams/operators/manifests/ApicurioRegistryManifestInstaller.java
+++ b/src/main/java/io/streams/operators/manifests/ApicurioRegistryManifestInstaller.java
@@ -14,9 +14,9 @@
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,8 +84,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Apicurio Registry operator installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Apicurio Registry operator readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, ApicurioRegistryManifestInstaller::isReady);
+        return Wait.untilAsync("Apicurio Registry operator readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, ApicurioRegistryManifestInstaller::isReady);
     }
 
     private static void modifyDeployment(Deployment deployment) {
diff --git a/src/main/java/io/streams/operators/manifests/CertManagerManifestInstaller.java b/src/main/java/io/streams/operators/manifests/CertManagerManifestInstaller.java
index 85a179c..ddf1465 100644
--- a/src/main/java/io/streams/operators/manifests/CertManagerManifestInstaller.java
+++ b/src/main/java/io/streams/operators/manifests/CertManagerManifestInstaller.java
@@ -9,9 +9,9 @@
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,8 +81,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Cert-manager installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Cert-manager readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, CertManagerManifestInstaller::isReady);
+        return Wait.untilAsync("Cert-manager readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, CertManagerManifestInstaller::isReady);
     }
 
     private static boolean isReady() {
diff --git a/src/main/java/io/streams/operators/manifests/DebeziumManifestInstaller.java b/src/main/java/io/streams/operators/manifests/DebeziumManifestInstaller.java
index ebf0a6c..67496c4 100644
--- a/src/main/java/io/streams/operators/manifests/DebeziumManifestInstaller.java
+++ b/src/main/java/io/streams/operators/manifests/DebeziumManifestInstaller.java
@@ -9,9 +9,9 @@
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,8 +75,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Debezium operator installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Debezium operator readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, DebeziumManifestInstaller::isReady);
+        return Wait.untilAsync("Debezium operator readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, DebeziumManifestInstaller::isReady);
     }
 
     private static boolean isReady() {
diff --git a/src/main/java/io/streams/operators/manifests/FlinkManifestInstaller.java b/src/main/java/io/streams/operators/manifests/FlinkManifestInstaller.java
index 4914084..f085179 100644
--- a/src/main/java/io/streams/operators/manifests/FlinkManifestInstaller.java
+++ b/src/main/java/io/streams/operators/manifests/FlinkManifestInstaller.java
@@ -10,9 +10,9 @@
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,8 +78,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Flink operator installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Flink operator readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, FlinkManifestInstaller::isReady);
+        return Wait.untilAsync("Flink operator readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, FlinkManifestInstaller::isReady);
     }
 
     private static boolean isReady() {
diff --git a/src/main/java/io/streams/operators/manifests/KeycloakManifestInstaller.java b/src/main/java/io/streams/operators/manifests/KeycloakManifestInstaller.java
index 2fef525..63c473d 100644
--- a/src/main/java/io/streams/operators/manifests/KeycloakManifestInstaller.java
+++ b/src/main/java/io/streams/operators/manifests/KeycloakManifestInstaller.java
@@ -10,9 +10,9 @@
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -76,8 +76,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Keycloak operator installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Keycloak operator readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, KeycloakManifestInstaller::isReady);
+        return Wait.untilAsync("Keycloak operator readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, KeycloakManifestInstaller::isReady);
     }
 
     private static boolean isReady() {
diff --git a/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java b/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java
index c79390b..836fe07 100644
--- a/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java
+++ b/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java
@@ -15,9 +15,9 @@
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBindingBuilder;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,8 +102,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Strimzi operator installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Strimzi operator readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, StrimziManifestInstaller::isReady);
+        return Wait.untilAsync("Strimzi operator readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, StrimziManifestInstaller::isReady);
     }
 
     private static void modifyDeployment(Deployment deployment) {
diff --git a/src/main/java/io/streams/operators/olm/bundle/FlinkOlmBundleInstaller.java b/src/main/java/io/streams/operators/olm/bundle/FlinkOlmBundleInstaller.java
index e4bdb11..fd1f71f 100644
--- a/src/main/java/io/streams/operators/olm/bundle/FlinkOlmBundleInstaller.java
+++ b/src/main/java/io/streams/operators/olm/bundle/FlinkOlmBundleInstaller.java
@@ -8,13 +8,13 @@
 import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.olm.OperatorSdkRun;
-import io.skodjob.testframe.olm.OperatorSdkRunBuilder;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.PodUtils;
-import io.skodjob.testframe.utils.TestFrameUtils;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.olm.OperatorSdkRun;
+import io.skodjob.kubetest4j.olm.OperatorSdkRunBuilder;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.KubeTestUtils;
+import io.skodjob.kubetest4j.utils.PodUtils;
+import io.skodjob.kubetest4j.wait.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,9 +42,9 @@ public static CompletableFuture<Void> install(String operatorName, String operat
             .withNamespace(operatorNamespace)
             .build();
 
-        return Wait.untilAsync(operatorName + " is ready", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, () -> {
-                TestFrameUtils.runUntilPass(3, () -> {
+        return Wait.untilAsync(operatorName + " is ready", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, () -> {
+                KubeTestUtils.runUntilPass(3, () -> {
                     Namespace ns = new NamespaceBuilder()
                         .withNewMetadata()
                         .withName(operatorNamespace)
diff --git a/src/main/java/io/streams/operators/olm/bundle/StrimziOlmBundleInstaller.java b/src/main/java/io/streams/operators/olm/bundle/StrimziOlmBundleInstaller.java
index 5b98504..5d96a4d 100644
--- a/src/main/java/io/streams/operators/olm/bundle/StrimziOlmBundleInstaller.java
+++ b/src/main/java/io/streams/operators/olm/bundle/StrimziOlmBundleInstaller.java
@@ -8,12 +8,12 @@
 import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.olm.OperatorSdkRun;
-import io.skodjob.testframe.olm.OperatorSdkRunBuilder;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.PodUtils;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.olm.OperatorSdkRun;
+import io.skodjob.kubetest4j.olm.OperatorSdkRunBuilder;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.PodUtils;
+import io.skodjob.kubetest4j.wait.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,8 +51,8 @@ public static CompletableFuture<Void> install(String operatorName, String operat
 
         CompletableFuture<Void> osrRun = CompletableFuture.runAsync(osr::run);
 
-        return Wait.untilAsync(operatorName + " is ready", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, () -> {
+        return Wait.untilAsync(operatorName + " is ready", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, () -> {
                 CompletableFuture.allOf(osrRun).join();
                 return isOperatorReady(operatorNamespace);
             });
diff --git a/src/main/java/io/streams/operators/olm/catalog/ApicurioOlmCatalogInstaller.java b/src/main/java/io/streams/operators/olm/catalog/ApicurioOlmCatalogInstaller.java
index ee42d99..4337405 100644
--- a/src/main/java/io/streams/operators/olm/catalog/ApicurioOlmCatalogInstaller.java
+++ b/src/main/java/io/streams/operators/olm/catalog/ApicurioOlmCatalogInstaller.java
@@ -11,10 +11,10 @@
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroupBuilder;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionBuilder;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.PodUtils;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.PodUtils;
+import io.skodjob.kubetest4j.wait.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,8 +81,8 @@ public static CompletableFuture<Void> install(String operatorName, String operat
             .build();
 
         KubeResourceManager.get().createOrUpdateResourceWithoutWait(subscription);
-        return Wait.untilAsync(operatorName + " is ready", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(operatorNamespace));
+        return Wait.untilAsync(operatorName + " is ready", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(operatorNamespace));
     }
 
     @SuppressFBWarnings("REC_CATCH_EXCEPTION")
diff --git a/src/main/java/io/streams/operators/olm/catalog/CertManagerOlmCatalogInstaller.java b/src/main/java/io/streams/operators/olm/catalog/CertManagerOlmCatalogInstaller.java
index 82e39cb..cdde2ac 100644
--- a/src/main/java/io/streams/operators/olm/catalog/CertManagerOlmCatalogInstaller.java
+++ b/src/main/java/io/streams/operators/olm/catalog/CertManagerOlmCatalogInstaller.java
@@ -11,11 +11,11 @@
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroupBuilder;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionBuilder;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.resources.ResourceItem;
-import io.skodjob.testframe.utils.PodUtils;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.ResourceItem;
+import io.skodjob.kubetest4j.utils.PodUtils;
+import io.skodjob.kubetest4j.wait.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -98,8 +98,8 @@ public static CompletableFuture<Void> install(String operatorName, String operat
         KubeResourceManager.get().pushToStack(new ResourceItem<>(() -> cleanClusterRole(), null));
         KubeResourceManager.get().pushToStack(new ResourceItem<>(() -> cleanValidationWebhook(), null));
         KubeResourceManager.get().createOrUpdateResourceWithoutWait(subscription);
-        return Wait.untilAsync(operatorName + " is ready", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(CERT_MANAGER_NS));
+        return Wait.untilAsync(operatorName + " is ready", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(CERT_MANAGER_NS));
     }
 
     @SuppressFBWarnings("REC_CATCH_EXCEPTION")
diff --git a/src/main/java/io/streams/operators/olm/catalog/KeycloakOlmCatalogInstaller.java b/src/main/java/io/streams/operators/olm/catalog/KeycloakOlmCatalogInstaller.java
index 99713ef..d2c3653 100644
--- a/src/main/java/io/streams/operators/olm/catalog/KeycloakOlmCatalogInstaller.java
+++ b/src/main/java/io/streams/operators/olm/catalog/KeycloakOlmCatalogInstaller.java
@@ -11,10 +11,10 @@
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroupBuilder;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionBuilder;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.PodUtils;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.PodUtils;
+import io.skodjob.kubetest4j.wait.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,8 +84,8 @@ public static CompletableFuture<Void> install(String operatorName, String operat
             .build();
 
         KubeResourceManager.get().createOrUpdateResourceWithoutWait(subscription);
-        return Wait.untilAsync(operatorName + " is ready", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(operatorName, operatorNamespace));
+        return Wait.untilAsync(operatorName + " is ready", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(operatorName, operatorNamespace));
     }
 
     @SuppressFBWarnings("REC_CATCH_EXCEPTION")
diff --git a/src/main/java/io/streams/operators/olm/catalog/StrimziOlmCatalogInstaller.java b/src/main/java/io/streams/operators/olm/catalog/StrimziOlmCatalogInstaller.java
index ffd0088..bf83d0f 100644
--- a/src/main/java/io/streams/operators/olm/catalog/StrimziOlmCatalogInstaller.java
+++ b/src/main/java/io/streams/operators/olm/catalog/StrimziOlmCatalogInstaller.java
@@ -11,10 +11,10 @@
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroupBuilder;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionBuilder;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.PodUtils;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.PodUtils;
+import io.skodjob.kubetest4j.wait.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,8 +81,8 @@ public static CompletableFuture<Void> install(String operatorName, String operat
             .build();
 
         KubeResourceManager.get().createOrUpdateResourceWithoutWait(subscription);
-        return Wait.untilAsync(operatorName + " is ready", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(operatorNamespace));
+        return Wait.untilAsync(operatorName + " is ready", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, () -> isOperatorReady(operatorNamespace));
     }
 
     @SuppressFBWarnings("REC_CATCH_EXCEPTION")
diff --git a/src/main/java/io/streams/utils/MinioUtils.java b/src/main/java/io/streams/utils/MinioUtils.java
index 6abb212..51863d7 100644
--- a/src/main/java/io/streams/utils/MinioUtils.java
+++ b/src/main/java/io/streams/utils/MinioUtils.java
@@ -6,9 +6,9 @@
 
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import io.streams.operands.minio.MinioInstaller;
 import org.apache.logging.log4j.LogManager;
@@ -93,8 +93,8 @@ private static int parseObjectCount(String bucketInfo) {
      */
     public static void waitForDataInMinio(String namespace, String bucketName) {
         Wait.until("data sync from Kafka to Minio",
-            TestFrameConstants.GLOBAL_POLL_INTERVAL_MEDIUM,
-            TestFrameConstants.GLOBAL_TIMEOUT,
+            KubeTestConstants.GLOBAL_POLL_INTERVAL_MEDIUM,
+            KubeTestConstants.GLOBAL_TIMEOUT,
             () -> {
                 String bucketSizeInfo = getBucketSizeInfo(namespace, bucketName);
                 Map<String, Object> parsedSize = parseTotalSize(bucketSizeInfo);
@@ -114,8 +114,8 @@ public static void waitForDataInMinio(String namespace, String bucketName) {
      */
     public static void waitForObjectsInMinio(String namespace, String bucketName) {
         Wait.until("data sync from Kafka to Minio",
-            TestFrameConstants.GLOBAL_POLL_INTERVAL_MEDIUM,
-            TestFrameConstants.GLOBAL_TIMEOUT,
+            KubeTestConstants.GLOBAL_POLL_INTERVAL_MEDIUM,
+            KubeTestConstants.GLOBAL_TIMEOUT,
             () -> {
                 String bucketSizeInfo = getBucketSizeInfo(namespace, bucketName);
                 int objectCount = parseObjectCount(bucketSizeInfo);
@@ -134,7 +134,7 @@ public static void waitForObjectsInMinio(String namespace, String bucketName) {
      * @param bucketName bucket name
      */
     public static void waitForNoDataInMinio(String namespace, String bucketName) {
-        Wait.until("data deletion in Minio", TestFrameConstants.GLOBAL_POLL_INTERVAL_MEDIUM, TestFrameConstants.GLOBAL_TIMEOUT, () -> {
+        Wait.until("data deletion in Minio", KubeTestConstants.GLOBAL_POLL_INTERVAL_MEDIUM, KubeTestConstants.GLOBAL_TIMEOUT, () -> {
             String bucketSizeInfo = getBucketSizeInfo(namespace, bucketName);
             Map<String, Object> parsedSize = parseTotalSize(bucketSizeInfo);
             double bucketSize = (Double) parsedSize.get("size");
diff --git a/src/test/java/io/streams/e2e/Abstract.java b/src/test/java/io/streams/e2e/Abstract.java
index 09c1227..3293279 100644
--- a/src/test/java/io/streams/e2e/Abstract.java
+++ b/src/test/java/io/streams/e2e/Abstract.java
@@ -4,17 +4,17 @@
  */
 package io.streams.e2e;
 
-import io.skodjob.testframe.annotations.MustGather;
-import io.skodjob.testframe.annotations.ResourceManager;
-import io.skodjob.testframe.annotations.TestVisualSeparator;
-import io.skodjob.testframe.resources.DeploymentType;
-import io.skodjob.testframe.resources.InstallPlanType;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.resources.NamespaceType;
-import io.skodjob.testframe.resources.OperatorGroupType;
-import io.skodjob.testframe.resources.ServiceType;
-import io.skodjob.testframe.resources.SubscriptionType;
-import io.skodjob.testframe.utils.KubeUtils;
+import io.skodjob.kubetest4j.annotations.MustGather;
+import io.skodjob.kubetest4j.annotations.ResourceManager;
+import io.skodjob.kubetest4j.annotations.TestVisualSeparator;
+import io.skodjob.kubetest4j.resources.DeploymentType;
+import io.skodjob.kubetest4j.resources.InstallPlanType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.NamespaceType;
+import io.skodjob.kubetest4j.resources.OperatorGroupType;
+import io.skodjob.kubetest4j.resources.ServiceType;
+import io.skodjob.kubetest4j.resources.SubscriptionType;
+import io.skodjob.kubetest4j.utils.KubeUtils;
 import io.streams.Environment;
 import io.streams.constants.TestConstants;
 import io.streams.listeners.MustGatherImpl;
diff --git a/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java b/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java
index fd7b716..c9535ce 100644
--- a/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java
+++ b/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java
@@ -14,9 +14,9 @@
 import io.skodjob.annotations.Step;
 import io.skodjob.annotations.SuiteDoc;
 import io.skodjob.annotations.TestDoc;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.JobUtils;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.JobUtils;
 import io.streams.clients.kafka.StrimziKafkaClients;
 import io.streams.clients.kafka.StrimziKafkaClientsBuilder;
 import io.streams.constants.TestConstants;
@@ -197,7 +197,7 @@ void testRecommendationApp() throws IOException {
                 strimziKafkaClients.consumerStrimzi()
             );
             JobUtils.waitForJobSuccess(namespace, strimziKafkaClients.getConsumerName(),
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
             String consumerPodName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, consumerName)
                 .get(0).getMetadata().getName();
 
@@ -342,7 +342,7 @@ void testRecommendationAppWithSqlConfigMap() throws IOException {
                     strimziKafkaClients.consumerStrimzi()
             );
             JobUtils.waitForJobSuccess(namespace, strimziKafkaClients.getConsumerName(),
-                    TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                    KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
             String consumerPodName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, consumerName)
                     .get(0).getMetadata().getName();
 
diff --git a/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java b/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java
index cfb25ff..4af97dd 100644
--- a/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java
+++ b/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java
@@ -15,10 +15,10 @@
 import io.skodjob.annotations.Step;
 import io.skodjob.annotations.SuiteDoc;
 import io.skodjob.annotations.TestDoc;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.JobUtils;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.JobUtils;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.clients.kafka.StrimziKafkaClients;
 import io.streams.clients.kafka.StrimziKafkaClientsBuilder;
 import io.streams.e2e.Abstract;
@@ -227,7 +227,7 @@ void testSimpleFilter() {
         });
 
         Allure.step("Wait until producer produce all messages", () ->
-            JobUtils.waitForJobSuccess(namespace, producerName, TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM));
+            JobUtils.waitForJobSuccess(namespace, producerName, KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM));
 
 
         Allure.step("Consume filtered messages", () -> {
@@ -251,7 +251,7 @@ void testSimpleFilter() {
             );
 
             JobUtils.waitForJobSuccess(namespace, kafkaConsumerClient.getConsumerName(),
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
             String consumerPodName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, consumerName)
                 .get(0).getMetadata().getName();
             String log = KubeResourceManager.get().kubeClient().getLogsFromPod(namespace, consumerPodName);
@@ -300,8 +300,8 @@ void testBadSqlStatement() {
 
         Allure.step("Verify that flink deployment failed with error", () -> {
             // Check if no task is deployed and error is proper in flink deployment
-            Wait.until("Flink deployment fail", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM, () -> {
+            Wait.until("Flink deployment fail", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM, () -> {
                     String error = new FlinkDeploymentType().getClient().inNamespace(namespace).withName(flinkDeploymentName)
                         .get().getStatus().getError();
                     return error.contains("DeploymentFailedException") ||
@@ -312,8 +312,8 @@ void testBadSqlStatement() {
             String podName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, flinkDeploymentName)
                 .get(0).getMetadata().getName();
 
-            Wait.until("Flink deployment contains error message", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM, () ->
+            Wait.until("Flink deployment contains error message", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM, () ->
                     KubeResourceManager.get().kubeClient()
                         .getLogsFromPod(namespace, podName).contains("SQL parse failed"));
         });
@@ -358,15 +358,15 @@ void testWrongConnectionInfo() {
 
         Allure.step("Verify that flink deployment fails with connection issue", () -> {
             // Check if no task is deployed and error is proper in flink deployment
-            Wait.until("Flink deployment starts", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM, () ->
+            Wait.until("Flink deployment starts", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM, () ->
                     !KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, flinkDeploymentName).isEmpty());
 
             String podName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, flinkDeploymentName)
                 .get(0).getMetadata().getName();
 
-            Wait.until("Flink deployment contains error message", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM, () ->
+            Wait.until("Flink deployment contains error message", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM, () ->
                     KubeResourceManager.get().kubeClient()
                         .getLogsFromPod(namespace, podName)
                         .contains("No resolvable bootstrap urls given in bootstrap.servers"));
@@ -556,13 +556,13 @@ void testFRocksDbStateBackend() {
 
         Allure.step("Wait for producer produce payment messages", () -> {
             JobUtils.waitForJobSuccess(namespace, producerName,
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
         });
 
         Allure.step("Verify that flink use rocksDB on PVC as state backend", () -> {
             //Check task manager log for presence rocksbd configuration
-            Wait.until("Task manager contains info about rocksdb", TestFrameConstants.GLOBAL_POLL_INTERVAL_LONG,
-                TestFrameConstants.GLOBAL_TIMEOUT, () -> {
+            Wait.until("Task manager contains info about rocksdb", KubeTestConstants.GLOBAL_POLL_INTERVAL_LONG,
+                KubeTestConstants.GLOBAL_TIMEOUT, () -> {
                     List<Pod> taskManagerPods = KubeResourceManager.get().kubeClient()
                         .listPodsByPrefixInName(namespace, flinkDeploymentName + "-taskmanager");
                     for (Pod p : taskManagerPods) {
@@ -594,7 +594,7 @@ void testFRocksDbStateBackend() {
             );
 
             JobUtils.waitForJobSuccess(namespace, kafkaConsumerClient.getConsumerName(),
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
             String consumerPodName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, consumerName)
                 .get(0).getMetadata().getName();
             String log = KubeResourceManager.get().kubeClient().getLogsFromPod(namespace, consumerPodName);
@@ -824,13 +824,13 @@ void testS3StateBackend() {
 
         Allure.step("Wait for producer produces all messages", () -> {
             JobUtils.waitForJobSuccess(namespace, producerName,
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
         });
 
         Allure.step("Verify that flink uses s3 as state backend", () -> {
             //Check task manager log for presence checkpoint configuration
-            Wait.until("Task manager contains info about state.backend", TestFrameConstants.GLOBAL_POLL_INTERVAL_LONG,
-                TestFrameConstants.GLOBAL_TIMEOUT, () -> {
+            Wait.until("Task manager contains info about state.backend", KubeTestConstants.GLOBAL_POLL_INTERVAL_LONG,
+                KubeTestConstants.GLOBAL_TIMEOUT, () -> {
                     List<Pod> taskManagerPods = KubeResourceManager.get().kubeClient()
                         .listPodsByPrefixInName(namespace, flinkDeploymentName + "-taskmanager");
                     for (Pod p : taskManagerPods) {
@@ -866,7 +866,7 @@ void testS3StateBackend() {
                 );
 
             JobUtils.waitForJobSuccess(namespace, kafkaConsumerClient.getConsumerName(),
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
             String consumerPodName = KubeResourceManager.get().kubeClient()
                 .listPodsByPrefixInName(namespace, consumerName)
                 .get(0)
diff --git a/src/test/java/io/streams/e2e/flink/sql/SqlSecurityST.java b/src/test/java/io/streams/e2e/flink/sql/SqlSecurityST.java
index 74af78e..6b8dbde 100644
--- a/src/test/java/io/streams/e2e/flink/sql/SqlSecurityST.java
+++ b/src/test/java/io/streams/e2e/flink/sql/SqlSecurityST.java
@@ -15,9 +15,9 @@
 import io.skodjob.annotations.Step;
 import io.skodjob.annotations.SuiteDoc;
 import io.skodjob.annotations.TestDoc;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.utils.JobUtils;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.utils.JobUtils;
 import io.streams.clients.kafka.StrimziKafkaClients;
 import io.streams.clients.kafka.StrimziKafkaClientsBuilder;
 import io.streams.e2e.Abstract;
@@ -371,7 +371,7 @@ void testOauthWithTls() {
             );
 
             JobUtils.waitForJobSuccess(namespace, kafkaConsumerClient.getConsumerName(),
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
             String consumerPodName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, consumerName)
                 .get(0).getMetadata().getName();
             String log = KubeResourceManager.get().kubeClient().getLogsFromPod(namespace, consumerPodName);
@@ -554,7 +554,7 @@ void testMTls() {
             );
 
             JobUtils.waitForJobSuccess(namespace, kafkaConsumerClient.getConsumerName(),
-                TestFrameConstants.GLOBAL_TIMEOUT_MEDIUM);
+                KubeTestConstants.GLOBAL_TIMEOUT_MEDIUM);
             String consumerPodName = KubeResourceManager.get().kubeClient().listPodsByPrefixInName(namespace, consumerName)
                 .get(0).getMetadata().getName();
             String log = KubeResourceManager.get().kubeClient().getLogsFromPod(namespace, consumerPodName);
diff --git a/tmt/plans/main.fmf b/tmt/plans/main.fmf
index ee391c9..f38a42c 100644
--- a/tmt/plans/main.fmf
+++ b/tmt/plans/main.fmf
@@ -30,7 +30,7 @@ prepare:
     how: install
     package:
       - wget
-      - java-17-openjdk-devel
+      - java-21-openjdk-devel
       - xz
       - make
       - git