diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index f2f7fabf..c93daa10 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -42,6 +42,8 @@ jobs:
         kubernetes: [v1.25.13,v1.28.1]
         suite: ['quarkus','quarkus-native','springboot','webapp','other','dockerfile']
     steps:
+      - name: env # TODO DELETE
+        run: env
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Java 11
@@ -112,7 +114,7 @@ jobs:
           path: ./it/target/jkube-test-report.txt
 
   minikube-legacy:
-    name: K8S
+    name: K8S (Minikube Legacy)
     needs: build-jkube
     runs-on: ubuntu-20.04
     strategy:
diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigK8sITCase.java b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigK8sITCase.java
index c5872482..f8f11856 100644
--- a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigK8sITCase.java
+++ b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigK8sITCase.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -118,6 +119,7 @@ void k8sHelmPush() throws Exception {
 
   @Test
   @DisplayName("k8s:helm-uninstall, no release present, display error message")
+  @DisabledIfEnvironmentVariable(named = "IMAGE_OS", matches = "ubuntu20")
   void k8sHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -133,6 +135,7 @@ void k8sHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Ex
   @Test
   @Order(4)
   @DisplayName("k8s:helm-install, should install the charts")
+  @DisabledIfEnvironmentVariable(named = "IMAGE_OS", matches = "ubuntu20")
   void k8sHelmInstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -150,6 +153,7 @@ void k8sHelmInstall() throws Exception {
   @Test
   @Order(5)
   @DisplayName("k8s:helm-uninstall, should uninstall the charts")
+  @DisabledIfEnvironmentVariable(named = "IMAGE_OS", matches = "ubuntu20")
   void k8sHelmUninstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
diff --git a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigOcITCase.java b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigOcITCase.java
index 61cd2be0..6a2625f2 100644
--- a/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigOcITCase.java
+++ b/it/src/test/java/org/eclipse/jkube/integrationtests/springboot/helmconfig/HelmConfigOcITCase.java
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -101,6 +102,7 @@ void ocHelm() throws Exception {
   @Test
   @Order(3)
   @DisplayName("oc:helm-push, should push the charts")
+  @DisabledIfEnvironmentVariable(named = "IMAGE_OS", matches = "ubuntu20")
   void ocHelmPush() throws Exception {
     // Given
     final Properties properties = properties(
@@ -120,6 +122,7 @@ void ocHelmPush() throws Exception {
 
   @Test
   @DisplayName("oc:helm-uninstall, no release present, display error message")
+  @DisabledIfEnvironmentVariable(named = "IMAGE_OS", matches = "ubuntu20")
   void ocHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -135,6 +138,7 @@ void ocHelmUninstall_whenNoReleasePresent_thenErrorMessageDisplayed() throws Exc
   @Test
   @Order(4)
   @DisplayName("oc:helm-install, should install the charts")
+  @DisabledIfEnvironmentVariable(named = "IMAGE_OS", matches = "ubuntu20")
   void ocHelmInstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -152,6 +156,7 @@ void ocHelmInstall() throws Exception {
   @Test
   @Order(5)
   @DisplayName("oc:helm-uninstall, should uninstall the charts")
+  @DisabledIfEnvironmentVariable(named = "IMAGE_OS", matches = "ubuntu20")
   void ocHelmUninstall() throws Exception {
     // Given
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();